(7ee8dbc11) v0.9.8.0

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs

@@ -310,6 +310,7 @@ namespace Barotrauma
             if (Submarine.MainSub != null)
             {
                 Rectangle dockedSubBorders = Submarine.MainSub.GetDockedBorders();
+                dockedSubBorders.Inflate(dockedSubBorders.Size.ToVector2() * 0.05f);
                 minWidth = Math.Max(minWidth, Math.Max(dockedSubBorders.Width, dockedSubBorders.Height));
                 minWidth = Math.Min(minWidth, maxWidth);
             }
@@ -1622,7 +1623,7 @@ namespace Barotrauma
                     EndOutpost = outpost;
                     if (GameMain.GameSession?.EndLocation != null) { outpost.Name = GameMain.GameSession.EndLocation.Name; }
                 }
-            }            
+            }
         }
 
         private bool IsModeStartOutpostCompatible()

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Ruins/RuinGenerator.cs

@@ -721,8 +721,10 @@ namespace Barotrauma.RuinGeneration
 
                     //doors create their own gaps, don't create an additional one if there's a door at this 
                     bool doorFound = false;
-                    foreach (Door door in doors)
+                    foreach (Item item in Item.ItemList)
                     {
+                        var door = item.GetComponent<Door>();
+                        if (door == null) { continue; }
                         if (Math.Abs(door.Item.WorldPosition.X - gapRect.Value.Center.X) < 5 &&
                             Math.Abs(door.Item.WorldPosition.Y - gapRect.Value.Center.Y) < 5)
                         {