diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index 5c4b1025e8..f94639efaf 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -882,7 +882,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);