Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disarm Trap now can be used in BattleGrounds and Arenas.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-05-23 18:06:22 -03:00
parent 37e6aa3634
commit 83afcd9061
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Spell.cpp
View File

@@ -5071,10 +5071,10 @@ SpellCastResult Spell::CheckCast(bool strict)
(!m_targets.getItemTarget() || !m_targets.getItemTarget()->GetProto()->LockID || m_targets.getItemTarget()->GetOwner() != m_caster))
return SPELL_FAILED_BAD_TARGETS;
// In BattleGround players can use only flags and banners
if (m_caster->ToPlayer()->InBattleGround() &&
!m_caster->ToPlayer()->CanUseBattleGroundObject())
return SPELL_FAILED_TRY_AGAIN;
if (m_spellInfo->Id != 1842 && m_targets.getGOTarget() && m_targets.getGOTarget()->GetGOInfo()->type != GAMEOBJECT_TYPE_TRAP) // disarm trap should not be affected
if (m_caster->ToPlayer()->InBattleGround() && // In BattleGround players can use only flags and banners
!m_caster->ToPlayer()->CanUseBattleGroundObject())
return SPELL_FAILED_TRY_AGAIN;
// get the lock entry
uint32 lockId = 0;

3
src/game/SpellEffects.cpp
View File

@@ -3400,7 +3400,8 @@ void Spell::EffectOpenLock(uint32 effIndex)
}
}else if (gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && gameObjTarget->GetOwner())
{
gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
return;
}
// TODO: Add script for spell 41920 - Filling, becouse server it freze when use this spell
// handle outdoor pvp object opening, return true if go was registered for handling