Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Unit: Name and implement UNIT_FLAG_NON_ATTACKABLE_2

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/de326d789ed955de819e0cbf37676716a038ad10)
This commit is contained in:
hondacrx
2021-10-08 10:36:08 -04:00
parent 72018b983c
commit 5de61110b3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/CreatureConst.cs
+1 -1
View File
@@ -64,7 +64,7 @@ namespace Framework.Constants
Silenced = 0x2000, Silenced = 0x2000,
CannotSwim = 0x4000, CannotSwim = 0x4000,
Unk15 = 0x8000, Unk15 = 0x8000,
Unk16 = 0x10000, NonAttackable2 = 0x10000,
Pacified = 0x20000, Pacified = 0x20000,
Stunned = 0x40000, Stunned = 0x40000,
InCombat = 0x80000, InCombat = 0x80000,
Source/Game/Entities/Object/WorldObject.cs
+2 -2
View File
@@ -2338,7 +2338,7 @@ namespace Game.Entities
} }
// check flags // 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; return false;
// ignore immunity flags when assisting // ignore immunity flags when assisting
@@ -2475,7 +2475,7 @@ namespace Game.Entities
return false; return false;
// check flags for negative spells // 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; return false;
if (isNegativeSpell || bySpell == null || !bySpell.HasAttribute(SpellAttr6.AssistIgnoreImmuneFlag)) if (isNegativeSpell || bySpell == null || !bySpell.HasAttribute(SpellAttr6.AssistIgnoreImmuneFlag))
Source/Game/Spells/Auras/AuraEffect.cs
+2 -2
View File
@@ -1684,9 +1684,9 @@ namespace Game.Spells
return; return;
if (apply) if (apply)
target.AddUnitFlag(UnitFlags.NonAttackable); target.AddUnitFlag(UnitFlags.NonAttackable2);
else else
target.RemoveUnitFlag(UnitFlags.NonAttackable); target.RemoveUnitFlag(UnitFlags.NonAttackable2);
// call functions which may have additional effects after chainging state of unit // call functions which may have additional effects after chainging state of unit
if (apply && mode.HasAnyFlag(AuraEffectHandleModes.Real)) if (apply && mode.HasAnyFlag(AuraEffectHandleModes.Real))