aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-07-14 21:31:16 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-07-14 21:31:16 +0200
commit524cc6c2d93edfff6262aa4f6c1abadd9ab26e9d (patch)
treedc722be9407a54a33b26f1decbeb68311fecbf25 /src
parent06d9d33de3e6a1e33d6d3edcd07e7d4e9457e735 (diff)
Core/Battleground: Fix typo and small cleanup (again thx @joschiwald)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Battlegrounds/Arena.cpp8
-rw-r--r--src/server/game/Battlegrounds/Battleground.cpp2
2 files changed, 3 insertions, 7 deletions
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp
index 96f3e644bea..23d540adfb9 100644
--- a/src/server/game/Battlegrounds/Arena.cpp
+++ b/src/server/game/Battlegrounds/Arena.cpp
@@ -233,13 +233,9 @@ void Arena::EndBattleground(uint32 winner)
if (!guildAwarded)
{
guildAwarded = true;
- if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetTeam()))
+ if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetBGTeam()))
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
- {
- guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1, 0, 0, NULL, player);
- if (isArena() && isRated() && winnerArenaTeam && loserArenaTeam && winnerArenaTeam != loserArenaTeam)
- guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, std::max<uint32>(winnerArenaTeam->GetRating(), 1), 0, 0, NULL, player);
- }
+ guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, std::max<uint32>(winnerArenaTeam->GetRating(), 1), 0, 0, NULL, player);
}
winnerArenaTeam->MemberWon(player, loserMatchmakerRating, winnerMatchmakerChange);
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 9b70d208e14..73dc69ecffa 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -828,7 +828,7 @@ void Battleground::EndBattleground(uint32 winner)
if (!guildAwarded)
{
guildAwarded = true;
- if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetTeam()))
+ if (uint32 guildId = GetBgMap()->GetOwnerGuildId(player->GetBGTeam()))
{
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
guild->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1, 0, 0, NULL, player);