From 1bf9b61ffad30e61597c29a2a22d3dc92ad820a8 Mon Sep 17 00:00:00 2001 From: Laintime Date: Sat, 15 Aug 2015 19:50:30 +0200 Subject: Core/Achievement: Fix Save The Day Closes #15202 Closes #15211 (cherry picked from commit 79cd2f9bb9e4cc214150ec36a85817bafad814d6) --- src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index b250e55bf01..685fcf11057 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -906,7 +906,10 @@ bool BattlegroundWS::CheckAchievementCriteriaMeet(uint32 criteriaId, Player cons switch (criteriaId) { case BG_CRITERIA_CHECK_SAVE_THE_DAY: - return GetFlagState(player->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE; + if (target) + if (Player const* playerTarget = target->ToPlayer()) + return GetFlagState(playerTarget->GetTeam()) == BG_WS_FLAG_STATE_ON_BASE; + return false; } return Battleground::CheckAchievementCriteriaMeet(criteriaId, player, target, miscValue); -- cgit v1.2.3