Core/Achievement: Fix Save The Day

Closes #15202 Closes #15211 (cherry picked from commit 79cd2f9bb9e4cc214150ec36a85817bafad814d6)
2015-09-24 22:14:15 +02:00
parent 4700b24263
commit 1bf9b61ffa
1 changed files with 4 additions and 1 deletions
@@ -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);