diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-19 17:57:30 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-19 17:57:30 -0500 |
| commit | 9dc2b7ecd566eea4115cea19a4036cfa49cce055 (patch) | |
| tree | f50c7015362ae2cad1dabb0bb6be83b63e56a0c7 /src/server/game/Spells/Spell.cpp | |
| parent | 972b41810330b287fc7c4172cf33878240cd25ce (diff) | |
| parent | 38ca1531d8738141c742d9b7f892a75af3283edd (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a02fa2d3d1b..45c4338f03d 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5229,7 +5229,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_spellInfo->Id != 1842 || (m_targets.GetGOTarget() && m_targets.GetGOTarget()->GetGOInfo()->type != GAMEOBJECT_TYPE_TRAP)) if (m_caster->ToPlayer()->InBattleground() && // In Battleground players can use only flags and banners - !m_caster->ToPlayer()->CanUseBattlegroundObject()) + !m_caster->ToPlayer()->CanUseBattlegroundObject(m_targets.GetGOTarget())) return SPELL_FAILED_TRY_AGAIN; // get the lock entry @@ -5640,7 +5640,7 @@ SpellCastResult Spell::CheckCasterAuras() const break; } } - if (foundNotStun) + if (foundNotStun && m_spellInfo->Id != 22812) prevented_reason = SPELL_FAILED_STUNNED; } else |