diff options
| author | megamage <none@none> | 2009-03-12 14:22:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-12 14:22:59 -0600 |
| commit | 16ee4a46c271bd7c234ffa7579f5f90cf2007772 (patch) | |
| tree | 6d547d8228472fcc97ead5dfcdd8a9aaf8f70233 /src/game/BattleGround.cpp | |
| parent | 6e12d3f1b9f40f3f95390245f3fcbb30fbd8657f (diff) | |
| parent | 1fbfc6da645058a6da3073dafde0e6bca621e31c (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/BattleGround.cpp')
| -rw-r--r-- | src/game/BattleGround.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 39dc135cffd..e058589483f 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1128,9 +1128,7 @@ void BattleGround::AddPlayer(Player *plr) if(GetStatus() == STATUS_WAIT_JOIN) // not started yet { - if(GetStatus() == STATUS_IN_PROGRESS) - plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION); - else plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true); + plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true); plr->SetHealth(plr->GetMaxHealth()); plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA)); |