From 264373bb656352a0cdf9b18bad4f3929c7376a9c 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: Core/Creature: prevent dead creatures from setting a focus target, so
 they won't turn when hit by certain spells. (#23367)

(cherry picked from commit 0a24a6571b7065d66afe52fc7b0b00f6366272bf)
---
 src/server/game/Entities/Creature/Creature.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 32094b774fa..3a0516ed6fa 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -3175,6 +3175,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;
-- 
cgit v1.2.3