diff options
| author | Blaymoira <none@none> | 2009-03-12 13:59:03 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-12 13:59:03 +0100 |
| commit | 31b206a377160699aba3661bb4320eeccafb32f1 (patch) | |
| tree | 8da3e7a256d036f6e8ef59b3ad2f9e5d88a99a71 /src | |
| parent | 52edebe0251e3b3bad2e599a0ed71b4c8b01650f (diff) | |
Backed out changeset: 87b298087552
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGround.cpp | 4 | ||||
| -rw-r--r-- | src/game/BattleGround.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 944e19bed1c..ccaab6cf6bc 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -980,9 +980,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)); diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index 41f7e37d235..b28ce709ada 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 = 32728, // use this one, 32727 has an invisibility aura which is wrong + SPELL_ARENA_PREPARATION = 32727, // use this one, 32728 not correct SPELL_ALLIANCE_GOLD_FLAG = 32724, SPELL_ALLIANCE_GREEN_FLAG = 32725, SPELL_HORDE_GOLD_FLAG = 35774, |