From c186c76103de13b4a777eeae0301269fc3b4778e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 25 Apr 2023 08:39:54 -0400 Subject: [PATCH] Core/Creature: Added missing nullcheck Port From (https://github.com/TrinityCore/TrinityCore/commit/209a36424eb9affc2ac3af2682fc9169a37d494f) --- Source/Game/Entities/Creature/Creature.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index fce3b0441..69c2478e7 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -1584,6 +1584,9 @@ namespace Game.Entities if (GetSparringHealthPct() == 0) return damage; + if (attacker == null) + return damage; + if (!attacker.IsCreature() || attacker.IsCharmedOwnedByPlayerOrPlayer() || IsCharmedOwnedByPlayerOrPlayer()) return damage;