From aafb08eaff43b862cc624e3da0761a5ed2adabd7 Mon Sep 17 00:00:00 2001 From: Meji Date: Tue, 5 Nov 2024 14:41:19 +0100 Subject: Core/Quests: Fix QuestGiverStatus for QUEST_TYPE_TURNIN (#30401) (cherry picked from commit c68f4ceeb58d9e113510359eb4b7e87ef270cc9e) --- src/server/game/Entities/Player/Player.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 48c7f7438f5..ccd85fadbad 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15304,15 +15304,11 @@ QuestGiverStatus Player::GetQuestDialogStatus(Object const* questgiver) const if (quest->IsTurnIn() && CanTakeQuest(quest, false)) { + bool isTrivial = GetLevel() > (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF)); if (quest->IsRepeatable()) - { - if (GetLevel() > (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) - result |= QuestGiverStatus::RepeatableTurnin; - else - result |= QuestGiverStatus::TrivialRepeatableTurnin; - } + result |= isTrivial ? QuestGiverStatus::TrivialRepeatableTurnin : QuestGiverStatus::RepeatableTurnin; else - result |= quest->HasFlag(QUEST_FLAGS_HIDE_REWARD_POI) ? QuestGiverStatus::RewardCompleteNoPOI : QuestGiverStatus::RewardCompletePOI; + result |= isTrivial ? QuestGiverStatus::Trivial : QuestGiverStatus::Quest; } } -- cgit v1.2.3