Build 0.20.12.0

2022-12-09 20:08:36 +02:00
parent a10cc13566
commit 6f788fb8b4
24 changed files with 203 additions and 456 deletions
@@ -224,8 +224,7 @@ namespace Barotrauma.Items.Components
            if (character == null) { return false; }
            if (character == Character.Controlled)
            {
-                if (targetSections.Count == 0) { return false; }
-                Spray(character, deltaTime, applyColors: true);
+                Spray(character, deltaTime, applyColors: targetSections.Count > 0);
                return true;
            }
            else
@@ -987,11 +987,8 @@ namespace Barotrauma.Items.Components
                    component.Color = borderComponent.OutlineColor = NoPowerColor;
                }

-                if (Voltage < MinVoltage) { continue; }
-
                if (!component.Visible) { continue; }
-                if (!(entity is Hull hull)) { continue; }
-
+                if (entity is not Hull hull) { continue; }
                if (!submarineContainer.Rect.Contains(component.Rect))
                {
                    if (hull.Submarine.Info.Type != SubmarineType.Player)
@@ -1001,6 +998,8 @@ namespace Barotrauma.Items.Components
                    }
                }

+                if (Voltage < MinVoltage) { continue; }
+
                hullDatas.TryGetValue(hull, out HullData? hullData);
                if (hullData is null)
                {