diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-01-11 17:27:41 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-01-11 17:27:41 +0000 |
| commit | ced89d7c682c6d4bbd10be1b48182be17192bd75 (patch) | |
| tree | 80fd180c61d3509e3c750753d594174c085d0542 /src/server/game/Spells/Spell.cpp | |
| parent | 08003577de2ea70fcbf4410eb889b67023bed700 (diff) | |
| parent | 6f6ad952b907cdbb7d4b4e33f972d60ed2e9fdf2 (diff) | |
Merge branch 'master' into 4.3.4
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8492c9a6671..417d7be78ad 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4814,6 +4814,10 @@ SpellCastResult Spell::CheckCast(bool strict) else return SPELL_FAILED_NOT_READY; } + + // check if we are using a potion in combat for the 2nd+ time. Cooldown is added only after caster gets out of combat + if (m_caster->ToPlayer()->GetLastPotionId() && m_CastItem && (m_CastItem->IsPotion() || m_spellInfo->IsCooldownStartedOnEvent())) + return SPELL_FAILED_NOT_READY; } if (m_spellInfo->AttributesEx7 & SPELL_ATTR7_IS_CHEAT_SPELL && !m_caster->HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS)) |