diff options
| author | Laintime <vova.ru29999@gmail.com> | 2015-08-15 19:50:30 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-09-24 22:14:15 +0200 |
| commit | 1bf9b61ffad30e61597c29a2a22d3dc92ad820a8 (patch) | |
| tree | 47a652ca67b01180c508aadefc87f8c72e6f92ab /src | |
| parent | 4700b242635e70ca26dcb6655875709625eca09b (diff) | |
Core/Achievement: Fix Save The Day
Closes #15202
Closes #15211
(cherry picked from commit 79cd2f9bb9e4cc214150ec36a85817bafad814d6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |