diff options
| author | Rat <none@none> | 2010-06-03 16:24:10 +0200 |
|---|---|---|
| committer | Rat <none@none> | 2010-06-03 16:24:10 +0200 |
| commit | 2e5edd301b5d1800213f0ceafda5af5dd4e2c0f6 (patch) | |
| tree | a29063ae4bddff713dc3eca3321454157bf98145 /src/game/BattleGround.cpp | |
| parent | 227cd4d9936c3367b55691d7136d3d862dec6d38 (diff) | |
dismount when entering a battleground
use 80 for max level honor bonus calculation
fixed SOTA second round timer
by Gyullo
--HG--
branch : trunk
Diffstat (limited to 'src/game/BattleGround.cpp')
| -rw-r--r-- | src/game/BattleGround.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 5fd7e7a3f6b..5bfe2e139b6 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -856,7 +856,8 @@ void BattleGround::EndBattleGround(uint32 winner) uint32 BattleGround::GetBonusHonorFromKill(uint32 kills) const { //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill) - return Trinity::Honor::hk_honor_at_level(GetMaxLevel(), kills); + uint32 maxLevel = (GetMaxLevel()<80)?GetMaxLevel():80; + return Trinity::Honor::hk_honor_at_level(maxLevel, kills); } uint32 BattleGround::GetBattlemasterEntry() const @@ -1080,6 +1081,8 @@ void BattleGround::AddPlayer(Player *plr) sBattleGroundMgr.BuildBattleGroundStatusPacket(&status, this, queueSlot, STATUS_IN_PROGRESS, 0, GetStartTime(), GetArenaType()); plr->GetSession()->SendPacket(&status); + plr->RemoveAurasByType(SPELL_AURA_MOUNTED); + // add arena specific auras if (isArena()) { |