Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/LFG: make sure that we always check for valor points in lfg rewards to send correct packet informations

Browse Source
This commit is contained in:
Ovahlord
2018-04-18 18:31:16 +02:00
parent d9b12217c4
commit d2acd68c67
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/game/Handlers/LFGHandler.cpp
View File

@@ -315,29 +315,39 @@ void WorldSession::SendLfgPlayerLockInfo()
uint32 dungeonId = *it;
data << uint32(dungeonId); // Dungeon Entry (id + type)
lfg::LfgReward const* reward = sLFGMgr->GetRandomDungeonReward(dungeonId, level);
Quest const* quest = nullptr;
bool firstCompletion = true;
bool firstCompletion = false;
Quest const* currentQuest = nullptr;
uint32 rewValorPoints = 0;
if (reward)
{
quest = sObjectMgr->GetQuestTemplate(reward->firstQuest);
if (quest)
if (Quest const* firstQuest = sObjectMgr->GetQuestTemplate(reward->firstQuest))
{
firstCompletion = player->CanRewardQuest(quest, false);
firstCompletion = player->CanRewardQuest(firstQuest, false);
if (reward->completionsPerWeek)
firstCompletion = player->SatisfyFirstLFGReward(dungeonId & 0x00FFFFFF, reward->completionsPerWeek);
if (firstCompletion)
currentQuest = firstQuest;
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; i++)
if (firstQuest->RewardCurrencyId[i] == CURRENCY_TYPE_VALOR_POINTS)
rewValorPoints += firstQuest->RewardCurrencyCount[i];
}
if (Quest const* otherQuest = sObjectMgr->GetQuestTemplate(reward->otherQuest))
{
if (!firstCompletion)
quest = sObjectMgr->GetQuestTemplate(reward->otherQuest);
currentQuest = otherQuest;
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; i++)
if (otherQuest->RewardCurrencyId[i] == CURRENCY_TYPE_VALOR_POINTS)
rewValorPoints += otherQuest->RewardCurrencyCount[i];
}
}
data << uint8(firstCompletion);
uint32 rewValorPoints = 0;
for (uint8 i = 0; i < QUEST_REWARD_CURRENCY_COUNT; i++)
if (quest && quest->RewardCurrencyId[i] == CURRENCY_TYPE_VALOR_POINTS)
rewValorPoints += quest->RewardCurrencyCount[i];
CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(CURRENCY_TYPE_VALOR_POINTS);
if (currency && rewValorPoints && !reward->completionsPerWeek)
@@ -432,8 +442,8 @@ void WorldSession::SendLfgPlayerLockInfo()
data << uint32(0);
}
if (quest)
BuildQuestReward(data, quest, player);
if (currentQuest)
BuildQuestReward(data, currentQuest, player);
else
{
data << uint32(0); // Money