From 1e74e0506b85bf0af7d200e095d89af721d37471 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 13 Oct 2021 14:48:17 -0400 Subject: [PATCH] Fixes loading server. --- Source/Game/Conditions/ConditionManager.cs | 4 ++-- Source/Game/Scripting/ScriptManager.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs index cd8df26cc..90ce36d1f 100644 --- a/Source/Game/Conditions/ConditionManager.cs +++ b/Source/Game/Conditions/ConditionManager.cs @@ -509,7 +509,7 @@ namespace Game valid = AddToPhases(cond); break; case ConditionSourceType.AreaTrigger: - areaTriggerConditionContainerStorage.Add(Tuple.Create((int)cond.SourceGroup, cond.SourceEntry != 0), cond); + areaTriggerConditionContainerStorage.Add(Tuple.Create(cond.SourceGroup, cond.SourceEntry != 0), cond); ++count; continue; default: @@ -2426,7 +2426,7 @@ namespace Game Dictionary> spellClickEventConditionStorage = new(); Dictionary> npcVendorConditionContainerStorage = new(); Dictionary, MultiMap> smartEventConditionStorage = new(); - MultiMap, Condition> areaTriggerConditionContainerStorage = new(); + MultiMap, Condition> areaTriggerConditionContainerStorage = new(); public string[] StaticSourceTypeData = { diff --git a/Source/Game/Scripting/ScriptManager.cs b/Source/Game/Scripting/ScriptManager.cs index df605e78e..e8d46f5f0 100644 --- a/Source/Game/Scripting/ScriptManager.cs +++ b/Source/Game/Scripting/ScriptManager.cs @@ -163,6 +163,7 @@ namespace Game.Scripting case "OnlyOnceAreaTriggerScript": case "SceneScript": case "QuestScript": + case "ConversationScript": if (!attribute.Name.IsEmpty()) name = attribute.Name;