diff options
| author | maximius <none@none> | 2009-10-13 15:59:11 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-13 15:59:11 -0700 |
| commit | 320feee9a3cf52cfcac1f0add6301efdd15386de (patch) | |
| tree | d6e42218c1c4f1f98790048f6cb6a4249a99d521 /src/game/Wintergrasp.cpp | |
| parent | 67f9dbab585dc2d021c976d34c2d7c53c6367eb0 (diff) | |
*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
Diffstat (limited to 'src/game/Wintergrasp.cpp')
| -rw-r--r-- | src/game/Wintergrasp.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index de9be0fbcca..8305d76ec47 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -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 |