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

Core/Quests: changed quest_template_addon.NextQuestID to unsigned

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c03373c59fd4103096936a19d8dd668959620a29)
This commit is contained in:
hondacrx
2020-05-06 13:18:14 -04:00
parent d453b9a8ef
commit d0cc070edf
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Globals/ObjectManager.cs
+2 -9
View File
@@ -6354,10 +6354,6 @@ namespace Game
} }
while (result.NextRow()); while (result.NextRow());
QuestLoaderHelper helper = new QuestLoaderHelper();
helper.LoaderFunction = (quest, fields) => quest.LoadQuestDetails(fields);
// Load `quest_details` // Load `quest_details`
// 0 1 2 3 4 5 6 7 8 // 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"); 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) if (qinfo.NextQuestId != 0)
{ {
var nextquest = _questTemplates.LookupByKey((uint)Math.Abs(qinfo.NextQuestId)); var nextquest = _questTemplates.LookupByKey(qinfo.NextQuestId);
if (nextquest == null) if (nextquest == null)
Log.outError(LogFilter.Sql, "Quest {0} has NextQuestId {1}, but no such quest", qinfo.Id, qinfo.NextQuestId); Log.outError(LogFilter.Sql, "Quest {0} has NextQuestId {1}, but no such quest", qinfo.Id, qinfo.NextQuestId);
else else
{ nextquest.prevQuests.Add((int)qinfo.Id);
int signedQuestId = qinfo.NextQuestId < 0 ? -(int)qinfo.Id : (int)qinfo.Id;
nextquest.prevQuests.Add(signedQuestId);
}
} }
if (qinfo.ExclusiveGroup != 0) if (qinfo.ExclusiveGroup != 0)
Source/Game/Quest/Quest.cs
+2 -2
View File
@@ -196,7 +196,7 @@ namespace Game
AllowableClasses = fields.Read<uint>(2); AllowableClasses = fields.Read<uint>(2);
SourceSpellID = fields.Read<uint>(3); SourceSpellID = fields.Read<uint>(3);
PrevQuestId = fields.Read<int>(4); PrevQuestId = fields.Read<int>(4);
NextQuestId = fields.Read<int>(5); NextQuestId = fields.Read<uint>(5);
ExclusiveGroup = fields.Read<int>(6); ExclusiveGroup = fields.Read<int>(6);
RewardMailTemplateId = fields.Read<uint>(7); RewardMailTemplateId = fields.Read<uint>(7);
RewardMailDelay = fields.Read<uint>(8); RewardMailDelay = fields.Read<uint>(8);
@@ -646,7 +646,7 @@ namespace Game
public uint AllowableClasses { get; set; } public uint AllowableClasses { get; set; }
public uint SourceSpellID { get; set; } public uint SourceSpellID { get; set; }
public int PrevQuestId; public int PrevQuestId;
public int NextQuestId; public uint NextQuestId;
public int ExclusiveGroup; public int ExclusiveGroup;
public uint RewardMailTemplateId { get; set; } public uint RewardMailTemplateId { get; set; }
public uint RewardMailDelay { get; set; } public uint RewardMailDelay { get; set; }