aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 8b8c54bd69d..74d5ea3eff9 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1688,6 +1688,9 @@ uint32 Creature::CalculateDamageForSparring(Unit* attacker, uint32 damage)
if (GetSparringHealthPct() == 0)
return damage;
+ if (!attacker)
+ return damage;
+
if (!attacker->IsCreature() || attacker->IsCharmedOwnedByPlayerOrPlayer() || IsCharmedOwnedByPlayerOrPlayer())
return damage;