From d7d0048b7edfe4842835b2c05c67b18d128e55aa Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Thu, 15 Mar 2018 20:31:34 +0100 Subject: [PATCH] Core/LFG: do not display currentcy reward info in chat window for random dungeon rewards --- src/server/game/DungeonFinding/LFGMgr.cpp | 6 +++--- src/server/game/Entities/Player/Player.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 61c84501af8..0e752827c3d 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1485,7 +1485,7 @@ void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, Map const* // if we can take the quest, means that we haven't done this kind of "run", IE: First Heroic Random of Day. if (player->CanRewardQuest(quest, false)) - player->RewardQuest(quest, 0, NULL, false); + player->RewardQuest(quest, 0, nullptr, false); else { done = true; @@ -1493,7 +1493,7 @@ void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, Map const* if (!quest) continue; // we give reward without informing client (retail does this) - player->RewardQuest(quest, 0, NULL, false); + player->RewardQuest(quest, 0, nullptr, false); } uint8 tmpRole = 0; if (Group *group = player->GetGroup()) @@ -1503,7 +1503,7 @@ void LFGMgr::FinishDungeon(ObjectGuid gguid, const uint32 dungeonId, Map const* if (player->GetCallToArmsTempRoles() & tmpRole) { const Quest* q = sObjectMgr->GetQuestTemplate(LFG_CALL_TO_ARMS_QUEST); - player->RewardQuest(q, 0, NULL, false); + player->RewardQuest(q, 0, nullptr, false); } player->SetTempCallToArmsRoles(0); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 77fed0f4934..d3332bc6ec8 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15278,7 +15278,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; ++i) if (quest->RewardCurrencyId[i]) - ModifyCurrency(quest->RewardCurrencyId[i], quest->RewardCurrencyCount[i]); + ModifyCurrency(quest->RewardCurrencyId[i], quest->RewardCurrencyCount[i], !quest->IsDFQuest()); if (uint32 skill = quest->GetRewardSkillId()) UpdateSkillPro(skill, 1000, quest->GetRewardSkillPoints());