Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/LFG: fixed displaying weekly rewards for first raid finder reward

Browse Source
This commit is contained in:
Ovahlord
2018-04-17 20:28:24 +02:00
parent 595c20298b
commit dfdb8de7cf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Player/Player.cpp
View File

@@ -15311,7 +15311,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
CharacterDatabase.CommitTransaction(trans);
}
if ((quest->IsDaily() || quest->IsDFQuest()) && !quest->IsRepeatable() && !quest->IsWeekly())
if ((quest->IsDaily() || (quest->IsDFQuest()) && !quest->IsRepeatable()) && !quest->IsWeekly())
{
SetDailyQuestStatus(quest_id);
if (quest->IsDaily())

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

@@ -316,19 +316,19 @@ void WorldSession::SendLfgPlayerLockInfo()
data << uint32(dungeonId); // Dungeon Entry (id + type)
lfg::LfgReward const* reward = sLFGMgr->GetRandomDungeonReward(dungeonId, level);
Quest const* quest = nullptr;
bool done = false;
bool firstCompletion = true;
if (reward)
{
quest = sObjectMgr->GetQuestTemplate(reward->firstQuest);
if (quest)
{
done = !player->CanRewardQuest(quest, false);
if (done)
firstCompletion = player->CanRewardQuest(quest, false);
if (!firstCompletion)
quest = sObjectMgr->GetQuestTemplate(reward->otherQuest);
}
}
data << uint8(done);
data << uint8(firstCompletion);
CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(CURRENCY_TYPE_VALOR_POINTS);
int8 valorPointsField = -1;
@@ -350,7 +350,7 @@ void WorldSession::SendLfgPlayerLockInfo()
data << uint32(player->GetCurrencyWeekCap(currency)); // overall valor points weekly cap
data << uint32(player->GetCurrencyOnWeek(CURRENCY_TYPE_VALOR_POINTS, false)); // purseQuantity
data << uint32(player->GetCurrencyTotalCap(currency)); // purseLimit
data << uint32(0); // some sort of reward for completion
data << uint32(valorPointsField >= 0 ? quest->RewardCurrencyCount[valorPointsField] : 0); // some sort of reward for completion
}
else
{