From 5bcfe49c7b38c47982d221b14c24fb596925b34e Mon Sep 17 00:00:00 2001 From: Wyrserth <43747507+Wyrserth@users.noreply.github.com> Date: Sat, 15 Jun 2019 15:03:09 +0200 Subject: [PATCH] Core/Creature: prevent dead creatures from setting a focus target, so they won't turn when hit by certain spells. (#23367) --- src/server/game/Entities/Creature/Creature.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c7660eeb5a6..800d8698a60 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2946,6 +2946,10 @@ void Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target) if (m_focusSpell) return; + // Prevent dead creatures from setting a focus target, so they won't turn + if (!IsAlive()) + return; + // some spells shouldn't track targets if (focusSpell->IsFocusDisabled()) return;