From ca505967e3daefcc245c10be2bb157a02f5759ed Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 18 Jun 2025 19:51:26 +0200 Subject: [PATCH] Core/Quests: fixed sending the correct gold amount when a quest has RequiredMoney --- src/server/game/Entities/Player/Player.cpp | 7 +++++-- src/server/game/Entities/Player/Player.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index cc57cc191d..15a96fef00 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14193,9 +14193,12 @@ void Player::IncompleteQuest(uint32 quest_id) if (log_slot < MAX_QUEST_LOG_SIZE) RemoveQuestSlotState(log_slot, QUEST_STATE_COMPLETE); } } -uint32 Player::GetQuestMoneyReward(Quest const* quest) const +int32 Player::GetQuestMoneyReward(Quest const* quest) const { - uint32 moneyReward = quest->GetMoneyReward(this) * sWorld->getRate(RATE_MONEY_QUEST); + int32 moneyReward = quest->GetMoneyReward(this) * sWorld->getRate(RATE_MONEY_QUEST); + if (moneyReward < 0) + return moneyReward; + if (IsMaxLevel()) moneyReward += quest->GetRewMoneyMaxLevel(this) * sWorld->getRate(RATE_MONEY_MAX_LEVEL_QUEST); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index db0d9e4444..737d826dde 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1314,7 +1314,7 @@ class TC_GAME_API Player : public Unit, public GridObject void AbandonQuest(uint32 quest_id); void CompleteQuest(uint32 quest_id); void IncompleteQuest(uint32 quest_id); - uint32 GetQuestMoneyReward(Quest const* quest) const; + int32 GetQuestMoneyReward(Quest const* quest) const; uint32 GetQuestXPReward(Quest const* quest); void RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool announce = true); void SetRewardedQuest(uint32 quest_id);