aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-01-18 02:10:17 +0100
committertreeston <treeston.mmoc@gmail.com>2016-01-18 02:10:17 +0100
commit17f924a031e5ebbbc07a54acd61e738bf234867a (patch)
treeed185e643fd41beda35a47c5017370d580d5ad1c /src
parent7f5805f30841697a67ff37163d08544a3f148414 (diff)
Spell facing follow-up: Fix an issue with creatures' channeled spells not cancelling properly in certain conditions
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 3e67f709816..31320e4d65e 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2739,7 +2739,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());
}
}