Handling exceptions in particle update, gamesession UI order fix, traitor setting loading fix

2016-11-16 20:14:14 +02:00
parent d37bad2d44
commit 16cf9f6c81
5 changed files with 18 additions and 5 deletions
@@ -91,8 +91,6 @@ namespace Barotrauma

        public override void AddToGUIUpdateList()
        {
-            if (GameMain.GameSession != null) GameMain.GameSession.AddToGUIUpdateList();
-
            if (Character.Controlled != null && Character.Controlled.SelectedConstruction != null)
            {
                if (Character.Controlled.SelectedConstruction == Character.Controlled.ClosestItem)
@@ -100,6 +98,9 @@ namespace Barotrauma
                    Character.Controlled.SelectedConstruction.AddToGUIUpdateList();
                }
            }
+
+            if (GameMain.GameSession != null) GameMain.GameSession.AddToGUIUpdateList();
+
            Character.AddAllToGUIUpdateList();
        }