From d0cc070edf9033af482c7e75e4f4127f496838f9 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 6 May 2020 13:18:14 -0400 Subject: [PATCH] Core/Quests: changed quest_template_addon.NextQuestID to unsigned Port From (https://github.com/TrinityCore/TrinityCore/commit/c03373c59fd4103096936a19d8dd668959620a29) --- Source/Game/Globals/ObjectManager.cs | 11 ++--------- Source/Game/Quest/Quest.cs | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index cd30fc072..5b789b76b 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -6354,10 +6354,6 @@ namespace Game } while (result.NextRow()); - QuestLoaderHelper helper = new QuestLoaderHelper(); - helper.LoaderFunction = (quest, fields) => quest.LoadQuestDetails(fields); - - // Load `quest_details` // 0 1 2 3 4 5 6 7 8 result = DB.World.Query("SELECT ID, Emote1, Emote2, Emote3, Emote4, EmoteDelay1, EmoteDelay2, EmoteDelay3, EmoteDelay4 FROM quest_details"); @@ -7115,14 +7111,11 @@ namespace Game if (qinfo.NextQuestId != 0) { - var nextquest = _questTemplates.LookupByKey((uint)Math.Abs(qinfo.NextQuestId)); + var nextquest = _questTemplates.LookupByKey(qinfo.NextQuestId); if (nextquest == null) Log.outError(LogFilter.Sql, "Quest {0} has NextQuestId {1}, but no such quest", qinfo.Id, qinfo.NextQuestId); else - { - int signedQuestId = qinfo.NextQuestId < 0 ? -(int)qinfo.Id : (int)qinfo.Id; - nextquest.prevQuests.Add(signedQuestId); - } + nextquest.prevQuests.Add((int)qinfo.Id); } if (qinfo.ExclusiveGroup != 0) diff --git a/Source/Game/Quest/Quest.cs b/Source/Game/Quest/Quest.cs index 5a59d2f52..eb348a6c0 100644 --- a/Source/Game/Quest/Quest.cs +++ b/Source/Game/Quest/Quest.cs @@ -196,7 +196,7 @@ namespace Game AllowableClasses = fields.Read(2); SourceSpellID = fields.Read(3); PrevQuestId = fields.Read(4); - NextQuestId = fields.Read(5); + NextQuestId = fields.Read(5); ExclusiveGroup = fields.Read(6); RewardMailTemplateId = fields.Read(7); RewardMailDelay = fields.Read(8); @@ -646,7 +646,7 @@ namespace Game public uint AllowableClasses { get; set; } public uint SourceSpellID { get; set; } public int PrevQuestId; - public int NextQuestId; + public uint NextQuestId; public int ExclusiveGroup; public uint RewardMailTemplateId { get; set; } public uint RewardMailDelay { get; set; }