(3622747f3) Unstable 0.9.705.0

2020-02-08 21:46:05 +02:00
parent 6754b9d5a2
commit 8324d20464
44 changed files with 403 additions and 265 deletions
@@ -67,6 +67,9 @@ namespace Barotrauma
        {
            if (isClient) { return; }

+            pendingEventSets.Clear();
+            selectedEvents.Clear();
+
            var suitableSettings = EventManagerSettings.List.FindAll(s =>
                level.Difficulty >= s.MinLevelDifficulty &&
                level.Difficulty <= s.MaxLevelDifficulty);
@@ -322,6 +325,12 @@ namespace Barotrauma

                    pendingEventSets.RemoveAt(i);

+                    if (!selectedEvents.ContainsKey(eventSet))
+                    {
+                        DebugConsole.ThrowError("Error in EventManager.Update: pending event set \"" + eventSet.DebugIdentifier + "\" not present in selected event sets.");
+                        continue;
+                    }
+
                    //start events in this set
                    foreach (ScriptedEvent scriptedEvent in selectedEvents[eventSet])
                    {