aboutsummaryrefslogtreecommitdiff
path: root/src/game/BattleGround.cpp
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2009-12-27 11:27:38 +0100
committern0n4m3 <none@none>2009-12-27 11:27:38 +0100
commit4737d8111a71145da5ab3d2ec3af2611a3908fac (patch)
tree9b0d2c6429a77576cc97ee28f616b802fb0019c5 /src/game/BattleGround.cpp
parentbdc8ba8b0c34b641b527bf750601f5662b202923 (diff)
Revert some commits. Now repo is stable. I recommend to disable Wintergrasp, because now its use leads to a crash.
--HG-- branch : trunk
Diffstat (limited to 'src/game/BattleGround.cpp')
-rw-r--r--src/game/BattleGround.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index aa7b146ebf5..554f8555627 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -737,7 +737,7 @@ void BattleGround::EndBattleGround(uint32 winner)
}
// should remove spirit of redemption
- if (plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
+ if(plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
plr->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
if (!plr->isAlive())
@@ -996,12 +996,9 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
Player *plr = objmgr.GetPlayer(guid);
// should remove spirit of redemption
- if (plr && plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
+ if(plr && plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
plr->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
- if (plr->HasAuraType(SPELL_AURA_MOUNTED))
- plr->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
if(plr && !plr->isAlive()) // resurrect on exit
{
plr->ResurrectPlayer(1.0f);