From c790d78095dbf3e49b4ff23c3949f87b17441c08 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 8 Sep 2021 23:36:28 -0400
Subject: [PATCH] Core/Entities: fix creatures ignoring immune flags.

Port From (https://github.com/TrinityCore/TrinityCore/commit/339a2acac86604c32a1501e0af3454b979ad1e1b)
---
 Source/Game/Entities/Object/WorldObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs
index cc0e34f9a..4bea72248 100644
--- a/Source/Game/Entities/Object/WorldObject.cs
+++ b/Source/Game/Entities/Object/WorldObject.cs
@@ -2338,7 +2338,7 @@ namespace Game.Entities
                 return false;
 
             // ignore immunity flags when assisting
-            if (isPositiveSpell && !bySpell.HasAttribute(SpellAttr6.AssistIgnoreImmuneFlag))
+            if (bySpell == null || (isPositiveSpell && !bySpell.HasAttribute(SpellAttr6.AssistIgnoreImmuneFlag)))
             {
                 if (unit != null && !unit.HasUnitFlag(UnitFlags.PvpAttackable) && unitTarget != null && unitTarget.IsImmuneToNPC())
                     return false;
@@ -2346,7 +2346,7 @@ namespace Game.Entities
                 if (unitTarget != null && !unitTarget.HasUnitFlag(UnitFlags.PvpAttackable) && unit && unit.IsImmuneToNPC())
                     return false;
 
-                if (!bySpell.HasAttribute(SpellAttr8.AttackIgnoreImmuneToPCFlag))
+                if (bySpell == null || !bySpell.HasAttribute(SpellAttr8.AttackIgnoreImmuneToPCFlag))
                 {
                     if (unit != null && unit.HasUnitFlag(UnitFlags.PvpAttackable) && unitTarget && unitTarget.IsImmuneToPC())
                         return false;