Last active
August 29, 2015 14:01
-
-
Save Demonid/f8b910c8854146848f74 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp | |
index c9275a0..056889a 100644 | |
--- a/src/server/game/Entities/Player/Player.cpp | |
+++ b/src/server/game/Entities/Player/Player.cpp | |
@@ -19122,14 +19122,9 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report | |
missingQuest = ar->quest_H; | |
uint32 missingAchievement = 0; | |
- Player* leader = this; | |
- uint64 leaderGuid = GetGroup() ? GetGroup()->GetLeaderGUID() : GetGUID(); | |
- if (leaderGuid != GetGUID()) | |
- leader = ObjectAccessor::FindPlayer(leaderGuid); | |
- if (ar->achievement) | |
- if (!leader || !leader->HasAchieved(ar->achievement)) | |
- missingAchievement = ar->achievement; | |
+ if (ar->achievement && !HasAchieved(ar->achievement)) | |
+ missingAchievement = ar->achievement; | |
Difficulty target_difficulty = GetDifficulty(mapEntry->IsRaid()); | |
MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(target_map, target_difficulty); | |
@@ -19139,12 +19134,14 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report | |
{ | |
if (missingQuest && !ar->questFailedText.empty()) | |
ChatHandler(GetSession()).PSendSysMessage("%s", ar->questFailedText.c_str()); | |
- else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case | |
- SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty); | |
+ /*else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case | |
+ SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty);*/ | |
else if (missingItem) | |
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str()); | |
else if (LevelMin) | |
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin); | |
+ else if (missingAchievement&& !ar->questFailedText.empty()) | |
+ ChatHandler(GetSession()).PSendSysMessage("%s", ar->questFailedText.c_str()); | |
} | |
return false; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment