From a2ffce3e51fd38559d13dd82910535aca7b1771b Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sun, 11 Dec 2022 12:58:48 +0100 Subject: [PATCH] =?UTF-8?q?fix(Core/Dungeons):=20Fixed=20displaying=20cust?= =?UTF-8?q?om=20requirement=20texts=20from=20`d=E2=80=A6=20(#14125)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(Core/Dungeons): Fixed displaying custom requirement texts from `dungeon_access_requirement`. Fixes #14069 --- src/server/game/Entities/Player/PlayerStorage.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 09773fbcc..a0f8dce5f 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -6793,7 +6793,7 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map { Player* checkPlayer = this; std::vector* missingAchievements = &missingPlayerAchievements; - if(achievementRequirement->checkLeaderOnly) + if (achievementRequirement->checkLeaderOnly) { checkPlayer = partyLeader; missingAchievements = &missingLeaderAchievements; @@ -6859,15 +6859,20 @@ bool Player::Satisfy(DungeonProgressionRequirements const* ar, uint32 target_map //Just print out the requirements are not met ChatHandler(GetSession()).SendSysMessage(LANG_ACCESS_REQUIREMENT_NOT_MET); } - else if(requirementPrintMode == 1) + else if (requirementPrintMode == 1) { //Blizzlike method of printing out the requirements - if (missingLeaderQuests.size() && !missingLeaderQuests[0]->note.empty()) + if (missingPlayerQuests.size() && !missingPlayerQuests[0]->note.empty()) + { + ChatHandler(GetSession()).PSendSysMessage("%s", missingPlayerQuests[0]->note.c_str()); + } + else if (missingLeaderQuests.size() && !missingLeaderQuests[0]->note.empty()) { ChatHandler(GetSession()).PSendSysMessage("%s", missingLeaderQuests[0]->note.c_str()); } else if (mapDiff->hasErrorMessage) - { // if (missingAchievement) covered by this case + { + // if (missingAchievement) covered by this case SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty); } else if (missingPlayerItems.size())