Core/Packets: Fixed possible crash in SandboxScalingData::GenerateDataForUnits

1 files changed, 4 insertions, 1 deletions

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())