From 209a36424eb9affc2ac3af2682fc9169a37d494f Mon Sep 17 00:00:00 2001 From: ModoX Date: Thu, 6 Apr 2023 01:25:49 +0200 Subject: Core/Creature: Added missing nullcheck --- src/server/game/Entities/Creature/Creature.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/server') 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; -- cgit v1.2.3