From 16f2673343e8a115ed40c0970e61ec474d965b5a Mon Sep 17 00:00:00 2001
From: joschiwald <joschiwald.trinity@gmail.com>
Date: Sun, 6 Aug 2017 18:08:07 +0200
Subject: Core/Packets: Fixed possible crash in
 SandboxScalingData::GenerateDataForUnits

---
 src/server/game/Server/Packets/CombatLogPacketsCommon.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
index 7265af29d17..76dd7573881 100644
--- a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
+++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp
@@ -125,7 +125,10 @@ namespace WorldPackets
             else if (Creature* creatureAttacker = attacker->ToCreature())
             {
                 if (Player* playerTarget = target->ToPlayer())
-                    return GenerateDataForUnits(creatureAttacker, playerTarget);
+                {
+                    if (creatureAttacker->HasScalableLevels())
+                        return GenerateDataForUnits(creatureAttacker, playerTarget);
+                }
                 else if (Creature* creatureTarget = target->ToCreature())
                 {
                     if (creatureAttacker->HasScalableLevels() || creatureTarget->HasScalableLevels())
-- 
cgit v1.2.3