diff options
| author | Rat <gmstreetrat@gmail.com> | 2011-11-26 20:38:25 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2011-11-26 20:38:25 +0100 |
| commit | ca03e79ce787702f97f3b3e3a09e39646bedc28f (patch) | |
| tree | f4df95bb5bf59823f002fd3e456f569936677283 /src/server/game/Battlegrounds/Battleground.cpp | |
| parent | 8cf3fde3291e8fdadef564232c2981d670a1e274 (diff) | |
| parent | bc37c75dfde1882b208be13731f9ffdc54938d62 (diff) | |
Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game/Battlegrounds/Battleground.cpp')
| -rwxr-xr-x | src/server/game/Battlegrounds/Battleground.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index af350ac39d6..7cfd4dec28e 100755 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -842,8 +842,8 @@ void Battleground::EndBattleground(uint32 winner) if (IsRandom() || BattlegroundMgr::IsBGWeekend(GetTypeID())) { UpdatePlayerScore(player, SCORE_BONUS_HONOR, GetBonusHonorFromKill(winner_kills)); - if (CanAwardArenaPoints()) - player->ModifyArenaPoints(winner_arena); + /*if (CanAwardArenaPoints()) + player->ModifyConquestPoints(winner_arena);*/ if (!player->GetRandomWinner()) player->SetRandomWinner(true); } |