From 5de61110b3b8e04db713f29e77b8bc0d350ac1a6 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 8 Oct 2021 10:36:08 -0400
Subject: [PATCH] Core/Unit: Name and implement UNIT_FLAG_NON_ATTACKABLE_2

Port From (https://github.com/TrinityCore/TrinityCore/commit/de326d789ed955de819e0cbf37676716a038ad10)
---
 Source/Framework/Constants/CreatureConst.cs | 2 +-
 Source/Game/Entities/Object/WorldObject.cs  | 4 ++--
 Source/Game/Spells/Auras/AuraEffect.cs      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Framework/Constants/CreatureConst.cs b/Source/Framework/Constants/CreatureConst.cs
index 5a6efd043..729c0c70a 100644
--- a/Source/Framework/Constants/CreatureConst.cs
+++ b/Source/Framework/Constants/CreatureConst.cs
@@ -64,7 +64,7 @@ namespace Framework.Constants
         Silenced = 0x2000,
         CannotSwim = 0x4000,
         Unk15 = 0x8000,
-        Unk16 = 0x10000,
+        NonAttackable2 = 0x10000,
         Pacified = 0x20000,
         Stunned = 0x40000,
         InCombat = 0x80000,
diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs
index cd2b27a32..875b38a45 100644
--- a/Source/Game/Entities/Object/WorldObject.cs
+++ b/Source/Game/Entities/Object/WorldObject.cs
@@ -2338,7 +2338,7 @@ namespace Game.Entities
             }
 
             // check flags
-            if (unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.NonAttackable | UnitFlags.TaxiFlight | UnitFlags.NotAttackable1 | UnitFlags.Unk16))
+            if (unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.NonAttackable | UnitFlags.TaxiFlight | UnitFlags.NotAttackable1 | UnitFlags.NonAttackable2))
                 return false;
 
             // ignore immunity flags when assisting
@@ -2475,7 +2475,7 @@ namespace Game.Entities
                 return false;
 
             // check flags for negative spells
-            if (isNegativeSpell && unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.NonAttackable | UnitFlags.TaxiFlight | UnitFlags.NotAttackable1 | UnitFlags.Unk16))
+            if (isNegativeSpell && unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.NonAttackable | UnitFlags.TaxiFlight | UnitFlags.NotAttackable1 | UnitFlags.NonAttackable2))
                 return false;
 
             if (isNegativeSpell || bySpell == null || !bySpell.HasAttribute(SpellAttr6.AssistIgnoreImmuneFlag))
diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs
index de6d9a112..ad2401980 100644
--- a/Source/Game/Spells/Auras/AuraEffect.cs
+++ b/Source/Game/Spells/Auras/AuraEffect.cs
@@ -1684,9 +1684,9 @@ namespace Game.Spells
                 return;
 
             if (apply)
-                target.AddUnitFlag(UnitFlags.NonAttackable);
+                target.AddUnitFlag(UnitFlags.NonAttackable2);
             else
-                target.RemoveUnitFlag(UnitFlags.NonAttackable);
+                target.RemoveUnitFlag(UnitFlags.NonAttackable2);
 
             // call functions which may have additional effects after chainging state of unit
             if (apply && mode.HasAnyFlag(AuraEffectHandleModes.Real))