diff options
| author | Blaymoira <none@none> | 2009-03-12 13:59:50 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-12 13:59:50 +0100 |
| commit | 2da8e7915cc38d10440f3a7cefc2f0c63306b1a2 (patch) | |
| tree | d837a4c2a89c5f5e23e9e75c6a64e1768c5b4140 /src | |
| parent | 3c5a92dbe0a1f140bbc7e1d9497e9e5d0d09e514 (diff) | |
| parent | 31b206a377160699aba3661bb4320eeccafb32f1 (diff) | |
*Merge
--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 c90911f1b58..8ef926b4aaf 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -967,9 +967,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 411bbaf6211..a0e0d94e6e8 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -68,7 +68,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, |