diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-07 03:34:23 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-07 03:34:23 +0100 |
| commit | 407286fe810b66a2bfe37b09e07c97142e6cc169 (patch) | |
| tree | 7e41da4dbdf0918cf7e3feace48e1556570d6e7a /src/server/game/AI/EventAI | |
| parent | a2d533752c447a2bf4ef7b784e8abdbe3f6d6904 (diff) | |
| parent | 21d43781acf1c60a66e4aa139324bff8d24d24d6 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/game/AI/EventAI')
| -rwxr-xr-x | src/server/game/AI/EventAI/CreatureEventAI.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index aa14bc1b56e..951a035628a 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -1317,6 +1317,10 @@ bool CreatureEventAI::CanCast(Unit* target, SpellInfo const* spell, bool trigger if (!me->IsInRange(target, spell->GetMinRange(false), spell->GetMaxRange(false))) return false; + //Spell is on cooldown + if (me->HasSpellCooldown(spell->Id)) + return false; + return true; } |