Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Battleground: Fix merge fail (thx @joschiwald)

Browse Source
This commit is contained in:
Vincent-Michael
2014-07-14 21:16:19 +02:00
parent 13ff07f121
commit 06d9d33de3
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Battlegrounds/Arena.cpp
View File

@@ -143,7 +143,7 @@ void Arena::EndBattleground(uint32 winner)
uint32 winnerMatchmakerRating = 0;
int32 winnerChange = 0;
int32 winnerMatchmakerChange = 0;
bool guildAwarded = false;
bool guildAwarded = false;
ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(winner));
ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeam(winner)));

14
src/server/game/Battlegrounds/Battleground.cpp
View File

@@ -26,6 +26,8 @@
#include "Formulas.h"
#include "GridNotifiersImpl.h"
#include "Group.h"
#include "GuildMgr.h"
#include "Guild.h"
#include "MapManager.h"
#include "Object.h"
#include "ObjectMgr.h"
@@ -743,6 +745,7 @@ void Battleground::EndBattleground(uint32 winner)
RemoveFromBGFreeSlotQueue();
int32 winmsg_id = 0;
bool guildAwarded = false;
if (winner == ALLIANCE)
{
@@ -768,7 +771,7 @@ void Battleground::EndBattleground(uint32 winner)
SetStatus(STATUS_WAIT_LEAVE);
//we must set it this way, because end time is sent in packet!
SetRemainingTime(TIME_AUTOCLOSE_BATTLEGROUND);
WorldPacket pvpLogData;
BuildPvPLogDataPacket(pvpLogData);
@@ -822,6 +825,15 @@ void Battleground::EndBattleground(uint32 winner)
player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, sWorld->getIntConfig(CONFIG_BG_REWARD_WINNER_CONQUEST_LAST));
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1);
if (!guildAwarded)
{
guildAwarded = true;
if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetTeam()))
{
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1, 0, 0, NULL, player);
}
}
}
else
{