(2402e736e) Tester's build, January 25th 2020

2020-01-25 12:48:13 +02:00
parent 4a58987eae
commit eaa18a20a3
57 changed files with 710 additions and 139 deletions
@@ -228,7 +228,9 @@ namespace Barotrauma
                if (hulls[i] == null) hulls[i] = Hull.FindHullOld(searchPos[i], null, false, true);
            }

-            if (hulls[0] == null && hulls[1] == null) return;
+            if (hulls[1] == hulls[0]) { hulls[1] = null; }
+
+            if (hulls[0] == null && hulls[1] == null) { return; }

            if (hulls[0] == null && hulls[1] != null)
            {