Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -3200,6 +3200,8 @@ namespace Barotrauma

                Color newColor = SetColor(null);

+                if (!IsSubEditor()) { return true; }
+
                Dictionary<object, List<ISerializableEntity>> oldProperties = new Dictionary<object, List<ISerializableEntity>>();

                foreach (var (sEntity, color, _) in entities)
@@ -3969,9 +3971,9 @@ namespace Barotrauma
            {
                loadFrame.AddToGUIUpdateList();
            }
-            else if (saveFrame != null)
+            else
            {
-                saveFrame.AddToGUIUpdateList();
+                saveFrame?.AddToGUIUpdateList();
            }
        }