diff options
| author | Spp <spp@jorge.gr> | 2012-10-19 14:24:11 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-19 14:24:11 +0200 |
| commit | 2e55abcde43c7e0aef3dda5cf896165491551031 (patch) | |
| tree | 9ff5edca826a758062681af16325a649d42d9e93 /src/server/game/Spells/Spell.cpp | |
| parent | 56df638092c551a025cd3dc200ed5d330f92fa63 (diff) | |
| parent | 4e8fa520c8aca831580fba9bf762486b9a9d7ed0 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 04a371ba776..57f3a7d3711 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5243,7 +5243,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 |