OBT/1.0.11

NotAlwaysTrue · web-flow · commit 82d26b5bb8d7 · 2025-12-30T17:41:50.000+08:00
Fixed a bug that caused the server to stop responding
Fixed an issue in gap.Update that may cause the server to crash
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs
@@ -812,7 +812,7 @@ public bool RefreshOutsideCollider()
             if (outsideCollisionBlocker == null) { return false; }
             if (IsRoomToRoom || Submarine == null || open <= 0.0f || linkedTo.Count == 0 || linkedTo[0] is not Hull) 
             {
-                outsideCollisionBlocker.Enabled = false;
+                outsideCollisionBlocker.AddToDisableQueue();
                 return false; 
             }
 
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs
@@ -686,6 +686,7 @@ public static void UpdateAll(float deltaTime, Camera cam, ParallelOptions parall
                         gap.ResetWaterFlowThisFrame();
                         gap.Update(deltaTime, cam);
                     });
+                    FarseerPhysics.Dynamics.Body.QueueDisable();
                 },
                 // Powered components update
                 () =>
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs b/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
@@ -245,10 +245,10 @@ public override void Update(double deltaTime)
             Character.Controlled?.UpdateLocalCursor(cam);
 
 #elif SERVER
-            Parallel.Invoke(parallelOptions,
-                () => { if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, Camera.Instance); },
-                () => Character.UpdateAll((float)deltaTime, Camera.Instance)
-            );
+
+            // Don't parallize these things here or the server may got stuck but why idk
+            if (Level.Loaded != null) { Level.Loaded.Update((float)deltaTime, Camera.Instance); }
+            Character.UpdateAll((float)deltaTime, Camera.Instance);
 
             //StatusEffect.UpdateAll is not thread-safe and must be executed on the main thread
             StatusEffect.UpdateAll((float)deltaTime);
@@ -272,9 +272,7 @@ public override void Update(double deltaTime)
 #if CLIENT
             MapEntity.UpdateAll((float)deltaTime, cam, parallelOptions);
 #elif SERVER
-
             MapEntity.UpdateAll((float)deltaTime, Camera.Instance, parallelOptions);
-            
 #endif
 
 #if CLIENT
diff --git a/Libraries/Farseer Physics Engine 3.5/Dynamics/Body.cs b/Libraries/Farseer Physics Engine 3.5/Dynamics/Body.cs
@@ -29,6 +29,7 @@
 
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -349,6 +350,21 @@ public bool Enabled
             }
         }
 
+        private static ConcurrentQueue<Body> DisableQueue = new ConcurrentQueue<Body>();
+
+        public static void QueueDisable()
+        {
+            while (DisableQueue.TryDequeue(out var pendingbody))
+            {
+                pendingbody.Enabled = false;
+            }
+        }
+
+        public void AddToDisableQueue()
+        {
+            DisableQueue.Enqueue(this);
+        }
+
         /// <summary>
         /// Create all proxies.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ public bool RefreshOutsideCollider()`
`812`	`812`	`if (outsideCollisionBlocker == null) { return false; }`
`813`	`813`	`if (IsRoomToRoom \|\| Submarine == null \|\| open <= 0.0f \|\| linkedTo.Count == 0 \|\| linkedTo[0] is not Hull)`
`814`	`814`	`{`
`815`		`- outsideCollisionBlocker.Enabled = false;`
	`815`	`+ outsideCollisionBlocker.AddToDisableQueue();`
`816`	`816`	`return false;`
`817`	`817`	`}`
`818`	`818`