aboutsummaryrefslogtreecommitdiff
path: root/src/game/BattleGround.cpp
diff options
context:
space:
mode:
authorBlaymoira <none@none>2009-02-28 17:35:49 +0100
committerBlaymoira <none@none>2009-02-28 17:35:49 +0100
commit52edebe0251e3b3bad2e599a0ed71b4c8b01650f (patch)
treee3f07878ed4940b99641e42930b3500109c90f31 /src/game/BattleGround.cpp
parentbc54e91afff9b9a53902439441fa2e63e3da1a9a (diff)
*Use proper spell for preparation & add a check for proper remove - by Sorken
--HG-- branch : trunk
Diffstat (limited to 'src/game/BattleGround.cpp')
-rw-r--r--src/game/BattleGround.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index ccaab6cf6bc..944e19bed1c 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -980,7 +980,9 @@ void BattleGround::AddPlayer(Player *plr)
if(GetStatus() == STATUS_WAIT_JOIN) // not started yet
{
- plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true);
+ if(GetStatus() == STATUS_IN_PROGRESS)
+ plr->RemoveAurasDueToSpell(SPELL_ARENA_PREPARATION);
+ else plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true);
plr->SetHealth(plr->GetMaxHealth());
plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA));