From 8258d517cf3a64e948243c331eb9964fbada9a0e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 16 Jul 2022 19:35:19 -0400 Subject: [PATCH] Core/Units: Replace UNIT_DYNFLAG_DEAD with UNIT_FLAG3_FAKE_DEAD Port From (https://github.com/TrinityCore/TrinityCore/commit/ed93a9706842ff5419279d4b2c473943e6ef2549) --- Source/Framework/Constants/UnitConst.cs | 2 +- Source/Game/Spells/Auras/AuraEffect.cs | 4 ++-- Source/Scripts/Spells/Generic.cs | 8 ++++---- Source/Scripts/Spells/Quest.cs | 2 +- Source/Scripts/World/NpcSpecial.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Framework/Constants/UnitConst.cs b/Source/Framework/Constants/UnitConst.cs index 24e2fceba..55bdb49bb 100644 --- a/Source/Framework/Constants/UnitConst.cs +++ b/Source/Framework/Constants/UnitConst.cs @@ -578,7 +578,7 @@ namespace Framework.Constants TrackUnit = 0x08, Tapped = 0x10, // Lua_UnitIsTapped SpecialInfo = 0x20, - Dead = 0x40, + Unused = 0x40, // previously UNIT_DYNFLAG_DEAD ReferAFriend = 0x80 } } diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index ee7fbd680..7c46b9f5f 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -1706,7 +1706,7 @@ namespace Game.Spells target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); target.SetUnitFlag2(UnitFlags2.FeignDeath); - target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag3(UnitFlags3.FakeDead); target.AddUnitState(UnitState.Died); Creature creature = target.ToCreature(); @@ -1717,7 +1717,7 @@ namespace Game.Spells { target.RemoveUnitFlag(UnitFlags.PreventEmotesFromChatText); target.RemoveUnitFlag2(UnitFlags2.FeignDeath); - target.RemoveDynamicFlag(UnitDynFlags.Dead); + target.RemoveUnitFlag3(UnitFlags3.FakeDead); target.ClearUnitState(UnitState.Died); Creature creature = target.ToCreature(); diff --git a/Source/Scripts/Spells/Generic.cs b/Source/Scripts/Spells/Generic.cs index 5cb39ca36..4f8ea4162 100644 --- a/Source/Scripts/Spells/Generic.cs +++ b/Source/Scripts/Spells/Generic.cs @@ -1848,7 +1848,7 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag3(UnitFlags3.FakeDead); target.SetUnitFlag2(UnitFlags2.FeignDeath); target.SetUnitFlag(UnitFlags.PreventEmotesFromChatText); @@ -1860,7 +1860,7 @@ namespace Scripts.Spells.Generic void OnRemove(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.RemoveDynamicFlag(UnitDynFlags.Dead); + target.RemoveUnitFlag3(UnitFlags3.FakeDead); target.RemoveUnitFlag2(UnitFlags2.FeignDeath); target.RemoveUnitFlag(UnitFlags.PreventEmotesFromChatText); @@ -1915,7 +1915,7 @@ namespace Scripts.Spells.Generic void HandleEffectApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag3(UnitFlags3.FakeDead); target.SetUnitFlag2(UnitFlags2.FeignDeath); Creature creature = target.ToCreature(); @@ -1926,7 +1926,7 @@ namespace Scripts.Spells.Generic void OnRemove(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.RemoveDynamicFlag(UnitDynFlags.Dead); + target.RemoveUnitFlag3(UnitFlags3.FakeDead); target.RemoveUnitFlag2(UnitFlags2.FeignDeath); Creature creature = target.ToCreature(); diff --git a/Source/Scripts/Spells/Quest.cs b/Source/Scripts/Spells/Quest.cs index 9eae7d0fe..d7b7cf8dd 100644 --- a/Source/Scripts/Spells/Quest.cs +++ b/Source/Scripts/Spells/Quest.cs @@ -1151,7 +1151,7 @@ namespace Scripts.Spells.Quest void HandleApply(AuraEffect aurEff, AuraEffectHandleModes mode) { Unit target = GetTarget(); - target.SetDynamicFlag(UnitDynFlags.Dead); + target.SetUnitFlag3(UnitFlags3.FakeDead); target.SetUnitFlag2(UnitFlags2.FeignDeath); Creature creature = target.ToCreature(); diff --git a/Source/Scripts/World/NpcSpecial.cs b/Source/Scripts/World/NpcSpecial.cs index d7deea90c..6819e9dfe 100644 --- a/Source/Scripts/World/NpcSpecial.cs +++ b/Source/Scripts/World/NpcSpecial.cs @@ -1059,7 +1059,7 @@ namespace Scripts.World.NpcSpecial me.RemoveUnitFlag(UnitFlags.InCombat); me.SetUnitFlag(UnitFlags.Uninteractible); me.SetDeathState(DeathState.JustDied); - me.SetDynamicFlag(UnitDynFlags.Dead); + me.SetUnitFlag3(UnitFlags3.FakeDead); if (!DoctorGUID.IsEmpty()) {