(78fa52fb7) Add a bunch of null checks, which should fix the issues with shuttles.

2019-05-16 06:51:34 +03:00
parent a2f97bf303
commit d794d22de0
15 changed files with 333 additions and 242 deletions
@@ -58,6 +58,10 @@ namespace Barotrauma
        {
            if (batteryList == null)
            {
+                if (character == null || character.Submarine == null)
+                {
+                    return new PowerContainer[0];
+                }
                batteryList = character.Submarine.GetItems(true).Select(i => i.GetComponent<PowerContainer>()).Where(b => b != null);
            }
            return batteryList;