(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
@@ -1077,6 +1077,7 @@ namespace Barotrauma

        public bool IsEntityFoundOnThisSub(MapEntity entity, bool includingConnectedSubs)
        {
+            if (entity == null) { return false; }
            if (entity.Submarine == this) { return true; }
            if (entity.Submarine == null) { return false; }
            if (includingConnectedSubs)