From 97bf9278a8d347badc85d7bcefdba0c1afb275e3 Mon Sep 17 00:00:00 2001 From: Treeston Date: Mon, 12 Aug 2019 19:42:49 +0200 Subject: Entities/Creature: Fix an edge case assertion failure with pets dying in specific situations while casting spells. (cherry picked from commit 6590a0bfcefe7b8e5f87c82ba5ab4df2c72be418) --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 34889a5cea7..492729909b6 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3259,7 +3259,7 @@ void Creature::SetSpellFocus(Spell const* focusSpell, WorldObject const* target) bool Creature::HasSpellFocus(Spell const* focusSpell) const { - if (!IsAlive()) // dead creatures cannot focus + if (isDead()) // dead creatures cannot focus { if (_spellFocusInfo.Spell || _spellFocusInfo.Delay) { -- cgit v1.2.3