Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Player: don't check quest requirements against RewardNextQuest

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3c2882c29d8ed8b9012b6c59662f68b0237249e2)
This commit is contained in:
hondacrx
2020-05-19 14:04:09 -04:00
parent e96e880237
commit 4c422b2a6a
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Quest.cs
+2 -22
View File
@@ -407,8 +407,7 @@ namespace Game.Entities
{ {
if (!Global.DisableMgr.IsDisabledFor(DisableType.Quest, quest.Id, this) && SatisfyQuestClass(quest, false) && SatisfyQuestRace(quest, false) && if (!Global.DisableMgr.IsDisabledFor(DisableType.Quest, quest.Id, this) && SatisfyQuestClass(quest, false) && SatisfyQuestRace(quest, false) &&
SatisfyQuestSkill(quest, false) && SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) && SatisfyQuestSkill(quest, false) && SatisfyQuestExclusiveGroup(quest, false) && SatisfyQuestReputation(quest, false) &&
SatisfyQuestDependentQuests(quest, false) && SatisfyQuestNextChain(quest, false) && SatisfyQuestDependentQuests(quest, false) && SatisfyQuestDay(quest, false) && SatisfyQuestWeek(quest, false) &&
SatisfyQuestDay(quest, false) && SatisfyQuestWeek(quest, false) &&
SatisfyQuestMonth(quest, false) && SatisfyQuestSeasonal(quest, false)) SatisfyQuestMonth(quest, false) && SatisfyQuestSeasonal(quest, false))
{ {
return GetLevel() + WorldConfig.GetIntValue(WorldCfg.QuestHighLevelHideDiff) >= GetQuestMinLevel(quest); return GetLevel() + WorldConfig.GetIntValue(WorldCfg.QuestHighLevelHideDiff) >= GetQuestMinLevel(quest);
@@ -424,7 +423,7 @@ namespace Game.Entities
&& SatisfyQuestClass(quest, msg) && SatisfyQuestRace(quest, msg) && SatisfyQuestLevel(quest, msg) && SatisfyQuestClass(quest, msg) && SatisfyQuestRace(quest, msg) && SatisfyQuestLevel(quest, msg)
&& SatisfyQuestSkill(quest, msg) && SatisfyQuestReputation(quest, msg) && SatisfyQuestSkill(quest, msg) && SatisfyQuestReputation(quest, msg)
&& SatisfyQuestDependentQuests(quest, msg) && SatisfyQuestTimed(quest, msg) && SatisfyQuestDependentQuests(quest, msg) && SatisfyQuestTimed(quest, msg)
&& SatisfyQuestNextChain(quest, msg) && SatisfyQuestDay(quest, msg) && SatisfyQuestDay(quest, msg)
&& SatisfyQuestWeek(quest, msg) && SatisfyQuestMonth(quest, msg) && SatisfyQuestWeek(quest, msg) && SatisfyQuestMonth(quest, msg)
&& SatisfyQuestSeasonal(quest, msg) && SatisfyQuestConditions(quest, msg); && SatisfyQuestSeasonal(quest, msg) && SatisfyQuestConditions(quest, msg);
} }
@@ -1561,25 +1560,6 @@ namespace Game.Entities
return true; return true;
} }
public bool SatisfyQuestNextChain(Quest qInfo, bool msg)
{
uint nextQuest = qInfo.NextQuestInChain;
if (nextQuest == 0)
return true;
// next quest in chain already started or completed
if (GetQuestStatus(nextQuest) != QuestStatus.None) // GetQuestStatus returns QuestStatus.CompleteD for rewarded quests
{
if (msg)
{
SendCanTakeQuestResponse(QuestFailedReasons.None);
Log.outDebug(LogFilter.Server, "SatisfyQuestNextChain: Sent QuestFailedReason.None (questId: {0}) because player already did or started next quest in chain.", qInfo.Id);
}
return false;
}
return true;
}
public bool SatisfyQuestDay(Quest qInfo, bool msg) public bool SatisfyQuestDay(Quest qInfo, bool msg)
{ {
if (!qInfo.IsDaily() && !qInfo.IsDFQuest()) if (!qInfo.IsDaily() && !qInfo.IsDFQuest())