*Add some missed timer changes to Kelthuzad from f9f9af1c2ae7

*When Wintersgrasp Battle ends, ressurect players -before- removing buffs, not after
*Fix some possible crashes in boss_svala.cpp

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-13 15:59:11 -07:00
parent 67f9dbab58
commit 320feee9a3
3 changed files with 20 additions and 22 deletions

View File

@@ -944,6 +944,10 @@ void OPvPWintergrasp::EndBattle()
for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
{
// When WG ends the zone is cleaned including corpses, revive all players if dead
if ((*itr)->isDead())
(*itr)->ResurrectPlayer(1.0f);
if ((*itr)->HasAura(SPELL_LIEUTENANT))
{
if (!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR))
@@ -960,12 +964,6 @@ void OPvPWintergrasp::EndBattle()
REMOVE_WARTIME_AURAS(*itr);
REMOVE_TENACITY_AURA(*itr);
(*itr)->CombatStop(true);
// When WG ends the zone is cleaned including corpses, revive all players if dead
if (((*itr)->isDead()) || ((*itr)->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)))
{
(*itr)->ResurrectPlayer(1.0f);
}
}
// destroyed all vehicles