diff options
| author | _manuel_ <manue.l@live.com.ar> | 2010-05-23 22:17:01 -0300 |
|---|---|---|
| committer | _manuel_ <manue.l@live.com.ar> | 2010-05-23 22:17:01 -0300 |
| commit | b6add13f9e69048aa2e812a1f9920bbc3a069f26 (patch) | |
| tree | 64817170f74acbc3138373532e98651176ffb3a0 /src/game/Spell.cpp | |
| parent | 8460168e5f40646d280f4dfae5c1277012ba0ef4 (diff) | |
Fixed checks for Disarm Trap, thanks to Spp.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index c54bba6b867..5b60e58b49f 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -5071,7 +5071,8 @@ SpellCastResult Spell::CheckCast(bool strict) (!m_targets.getItemTarget() || !m_targets.getItemTarget()->GetProto()->LockID || m_targets.getItemTarget()->GetOwner() != m_caster)) return SPELL_FAILED_BAD_TARGETS; - if (m_spellInfo->Id != 1842 && m_targets.getGOTarget() && m_targets.getGOTarget()->GetGOInfo()->type != GAMEOBJECT_TYPE_TRAP) // disarm trap should not be affected + 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()) return SPELL_FAILED_TRY_AGAIN; |