diff options
| author | Blaymoira <none@none> | 2009-02-28 17:35:49 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-02-28 17:35:49 +0100 |
| commit | 52edebe0251e3b3bad2e599a0ed71b4c8b01650f (patch) | |
| tree | e3f07878ed4940b99641e42930b3500109c90f31 | |
| parent | bc54e91afff9b9a53902439441fa2e63e3da1a9a (diff) | |
*Use proper spell for preparation & add a check for proper remove - by Sorken
--HG--
branch : trunk
| -rw-r--r-- | src/game/BattleGround.cpp | 4 | ||||
| -rw-r--r-- | src/game/BattleGround.h | 2 |
2 files changed, 4 insertions, 2 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)); diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index b28ce709ada..41f7e37d235 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -71,7 +71,7 @@ enum BattleGroundSpells SPELL_SPIRIT_HEAL_CHANNEL = 22011, // Spirit Heal Channel SPELL_SPIRIT_HEAL = 22012, // Spirit Heal SPELL_RESURRECTION_VISUAL = 24171, // Resurrection Impact Visual - SPELL_ARENA_PREPARATION = 32727, // use this one, 32728 not correct + SPELL_ARENA_PREPARATION = 32728, // use this one, 32727 has an invisibility aura which is wrong SPELL_ALLIANCE_GOLD_FLAG = 32724, SPELL_ALLIANCE_GREEN_FLAG = 32725, SPELL_HORDE_GOLD_FLAG = 35774, |