(3a5d98b) v0.9.6.0

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -575,6 +575,10 @@ namespace Barotrauma
 
         public void ApplyFlowForces(float deltaTime, Item item)
         {
+            if (item.body.Mass <= 0.0f)
+            {
+                return;
+            }
             foreach (var gap in ConnectedGaps.Where(gap => gap.Open > 0))
             {
                 var distance = MathHelper.Max(Vector2.DistanceSquared(item.Position, gap.Position) / 1000, 1f);

Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs

@@ -180,14 +180,22 @@ namespace Barotrauma
             }
 
             linkedSub.filePath = element.GetAttributeString("filepath", "");
-            int[] linkedToIds = element.GetAttributeIntArray("linkedto", new int[0]); 
+            int[] linkedToIds = element.GetAttributeIntArray("linkedto", new int[0]);
             for (int i = 0; i < linkedToIds.Length; i++)
             {
                 linkedSub.linkedToID.Add((ushort)linkedToIds[i]);
+                if (Screen.Selected == GameMain.SubEditorScreen)
+                {
+                    if (FindEntityByID((ushort)linkedToIds[i]) is MapEntity linked)
+                    {
+                        linkedSub.linkedTo.Add(linked);
+                    }
+                }
             }
             linkedSub.originalLinkedToID = (ushort)element.GetAttributeInt("originallinkedto", 0);
             linkedSub.originalMyPortID = (ushort)element.GetAttributeInt("originalmyport", 0);
-            
+
+
             return linkedSub.loadSub ? linkedSub : null;
         }