From 7bbc603efa48ce552eb21e92a677db99bf66494b Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 22 Jul 2020 17:23:58 +0200 Subject: [PATCH] Core/Spells: feign death react state cleanup --- src/server/scripts/Spells/spell_generic.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index cb636a78b6a..da45f00e364 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1225,8 +1225,8 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader target->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); - if (target->GetTypeId() == TYPEID_UNIT) - target->ToCreature()->SetReactState(REACT_PASSIVE); + if (Creature* creature = target->ToCreature()) + creature->SetReactState(REACT_PASSIVE); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -1234,6 +1234,9 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader Unit* target = GetTarget(); target->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); + + if (Creature* creature = target->ToCreature()) + creature->InitializeReactState(); } void Register() override