(cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player.

2019-03-27 20:57:36 +02:00
parent 776f71647d
commit 98224c6ec9
5 changed files with 195 additions and 3 deletions
@@ -180,7 +180,8 @@ namespace Barotrauma.Items.Components
 #endif

                //items in a bad condition are more sensitive to overvoltage
-                float maxOverVoltage = MathHelper.Lerp(Math.Min(OverloadVoltage, 1.0f), OverloadVoltage, item.Condition / item.MaxCondition);
+                float maxOverVoltage = MathHelper.Lerp(OverloadVoltage * 0.75f, OverloadVoltage, item.Condition / item.MaxCondition);
+                maxOverVoltage = Math.Max(OverloadVoltage, 1.0f);

                //if the item can't be fixed, don't allow it to break
                if (!item.Repairables.Any() || !CanBeOverloaded) continue;