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

Core/Quests: Correct criteria tree quest objective update conditions

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b37163b5e2aee2fe7a720559442cf85f3b0ccfbb)
This commit is contained in:
hondacrx
2021-02-09 13:09:44 -05:00
parent 3b5e98b045
commit 759e13f6e2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Quest/QuestObjectiveCriteriaManager.cs
+14 -5
View File
@@ -225,14 +225,10 @@ namespace Game
void CompletedObjective(QuestObjective questObjective, Player referencePlayer) void CompletedObjective(QuestObjective questObjective, Player referencePlayer)
{ {
// disable for gamemasters with GM-mode enabled
if (_owner.IsGameMaster())
return;
if (HasCompletedObjective(questObjective)) if (HasCompletedObjective(questObjective))
return; return;
referencePlayer.KillCreditCriteriaTreeObjective(questObjective); _owner.KillCreditCriteriaTreeObjective(questObjective);
Log.outInfo(LogFilter.Player, $"QuestObjectiveCriteriaMgr.CompletedObjective({questObjective.Id}). {GetOwnerInfo()}"); Log.outInfo(LogFilter.Player, $"QuestObjectiveCriteriaMgr.CompletedObjective({questObjective.Id}). {GetOwnerInfo()}");
@@ -281,6 +277,19 @@ namespace Game
return false; return false;
} }
if (_owner.GetQuestStatus(objective.QuestID) != QuestStatus.Incomplete)
{
Log.outTrace(LogFilter.Achievement, $"QuestObjectiveCriteriaMgr.CanUpdateCriteriaTree: (Id: {criteria.Id} Type {criteria.Entry.Type} Quest Objective {objective.Id}) Not on quest");
return false;
}
Quest quest = Global.ObjectMgr.GetQuestTemplate(objective.QuestID);
if (_owner.GetGroup() && _owner.GetGroup().IsRaidGroup() && !quest.IsAllowedInRaid(referencePlayer.GetMap().GetDifficultyID()))
{
Log.outTrace(LogFilter.Achievement, $"QuestObjectiveCriteriaMgr.CanUpdateCriteriaTree: (Id: {criteria.Id} Type {criteria.Entry.Type} Quest Objective {objective.Id}) Quest cannot be completed in raid group");
return false;
}
return base.CanUpdateCriteriaTree(criteria, tree, referencePlayer); return base.CanUpdateCriteriaTree(criteria, tree, referencePlayer);
} }