aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-01-18 02:10:17 +0100
committerShauren <shauren.trinity@gmail.com>2016-03-29 20:08:01 +0200
commitd9c99acebb8ff4943465980ef0018803495ba6ee (patch)
tree4f687482c6bedf9cb38c95b2e7545f3d50d86f3e
parent5f06f9ad60eb68863dab1e4a6449f59b5bd0b7ce (diff)
Spell facing follow-up: Fix an issue with creatures' channeled spells not cancelling properly in certain conditions
(cherry picked from commit 17f924a031e5ebbbc07a54acd61e738bf234867a)
-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 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());
}
}