From 6b7c0288e8fc91950134838b2e501b0c8675a55b Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 7 Dec 2020 11:29:29 -0500 Subject: [PATCH] Core/Quest: Fixes crash if DB contains no quest disables --- Source/Game/Conditions/DisableManager.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Game/Conditions/DisableManager.cs b/Source/Game/Conditions/DisableManager.cs index 8526a5f87..124ea7361 100644 --- a/Source/Game/Conditions/DisableManager.cs +++ b/Source/Game/Conditions/DisableManager.cs @@ -259,15 +259,14 @@ namespace Game public void CheckQuestDisables() { - uint oldMSTime = Time.GetMSTime(); - - int count = m_DisableMap[DisableType.Quest].Count; - if (count == 0) + if (!m_DisableMap.ContainsKey(DisableType.Quest) || m_DisableMap[DisableType.Quest].Count == 0) { Log.outInfo(LogFilter.ServerLoading, "Checked 0 quest disables."); return; } + uint oldMSTime = Time.GetMSTime(); + // check only quests, rest already done at startup foreach (var pair in m_DisableMap[DisableType.Quest]) { @@ -282,7 +281,7 @@ namespace Game Log.outError(LogFilter.Sql, "Disable flags specified for quest {0}, useless data.", entry); } - Log.outInfo(LogFilter.ServerLoading, "Checked {0} quest disables in {1} ms", count, Time.GetMSTimeDiffToNow(oldMSTime)); + Log.outInfo(LogFilter.ServerLoading, "Checked {0} quest disables in {1} ms", m_DisableMap[DisableType.Quest].Count, Time.GetMSTimeDiffToNow(oldMSTime)); } public bool IsDisabledFor(DisableType type, uint entry, Unit unit, byte flags = 0)