From d9c99acebb8ff4943465980ef0018803495ba6ee Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Mon, 18 Jan 2016 02:10:17 +0100
Subject: Spell facing follow-up: Fix an issue with creatures' channeled spells
 not cancelling properly in certain conditions

(cherry picked from commit 17f924a031e5ebbbc07a54acd61e738bf234867a)
---
 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 4c1e7af2615..de899b94ea2 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2664,7 +2664,7 @@ bool Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target)
                     }
                 }
             if (shouldDelay)
-                shouldDelay = (!focusSpell->IsTriggered() && !focusSpell->GetCastTime());
+                shouldDelay = !(focusSpell->IsTriggered() || focusSpell->GetCastTime() || focusSpell->GetSpellInfo()->IsChanneled());
 
         }
     }
-- 
cgit v1.2.3