Unstable 1.2.4.0

2023-11-30 13:53:00 +02:00
parent 8a2e2ea0ae
commit fb5ea537bf
210 changed files with 4201 additions and 1283 deletions
@@ -313,13 +313,18 @@ namespace Barotrauma

    public class GUIColor : GUISelector<GUIColorPrefab>
    {
-        public GUIColor(string identifier) : base(identifier) { }
+        private readonly Color fallbackColor;
+
+        public GUIColor(string identifier, Color fallbackColor) : base(identifier) 
+        { 
+            this.fallbackColor = fallbackColor;
+        }

        public Color Value
        {
            get
            {
-                return Prefabs.ActivePrefab.Color;
+                return Prefabs?.ActivePrefab?.Color ?? fallbackColor;
            }
        }