From d4fa2cf43fd37122be7ffa32af126697b8c37acb Mon Sep 17 00:00:00 2001 From: Gustavo Date: Fri, 14 Oct 2016 21:44:49 +0200 Subject: Core/Scripts Boss Lady DeathWhisper improvements (#17389) (cherry picked from commit 8e82d8a9e79ba95fbd780fa093416ebe7431a1c0) Rename 2016_99_99_99_world.sql to 2016_10_14_05_world.sql (cherry picked from commit b4b8a7477bcab15cb25a15bd3271279ae3220c94) --- src/server/scripts/Spells/spell_generic.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 4bee97da000..ab5fe968716 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1105,9 +1105,17 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader target->ToCreature()->SetReactState(REACT_PASSIVE); } + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + Unit* target = GetTarget(); + target->RemoveFlag(OBJECT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); + target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); + } + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_gen_creature_permanent_feign_death_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; -- cgit v1.2.3