From 986b0f979db5e8cccc9be4d7cbed9ce50bc1bd9e Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 29 May 2025 00:04:55 +1000
Subject: [PATCH] Fix physics forces not autoclearing (#5978)

* Fix physics forces not autoclearing

* Changes
---
 .../Physics/Systems/SharedPhysicsSystem.Island.cs    |  2 +-
 Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs |  2 +-
 .../Shared/Physics/GridReparentVelocity_Test.cs      | 12 ------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs b/Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs
index c3d7dc1dc..0d3708dd8 100644
--- a/Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs
+++ b/Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs
@@ -277,7 +277,7 @@ public abstract partial class SharedPhysicsSystem
         // TODO: SolveTOI
 
         // Box2d recommends clearing (if you are) during fixed updates rather than variable if you are using it
-        if (!prediction && _autoClearForces)
+        if (_autoClearForces)
             ClearForces();
 
         _invDt0 = invDt;
diff --git a/Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs b/Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs
index 9fbbb813c..b78b583f4 100644
--- a/Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs
+++ b/Robust.Shared/Physics/Systems/SharedPhysicsSystem.cs
@@ -121,7 +121,7 @@ namespace Robust.Shared.Physics.Systems
             InitializeIsland();
             InitializeContacts();
 
-            Subs.CVar(_cfg, CVars.AutoClearForces, OnAutoClearChange);
+            Subs.CVar(_cfg, CVars.AutoClearForces, OnAutoClearChange, true);
             Subs.CVar(_cfg, CVars.NetTickrate, UpdateSubsteps, true);
             Subs.CVar(_cfg, CVars.TargetMinimumTickrate, UpdateSubsteps, true);
         }
diff --git a/Robust.UnitTesting/Shared/Physics/GridReparentVelocity_Test.cs b/Robust.UnitTesting/Shared/Physics/GridReparentVelocity_Test.cs
index 4ad45e444..0e3af63a9 100644
--- a/Robust.UnitTesting/Shared/Physics/GridReparentVelocity_Test.cs
+++ b/Robust.UnitTesting/Shared/Physics/GridReparentVelocity_Test.cs
@@ -87,18 +87,6 @@ public sealed class GridReparentVelocity_Test
         return obj;
     }
 
-    [TearDown]
-    public void Teardown()
-    {
-        _entManager.DeleteEntity(_gridUid);
-        _gridUid = default!;
-        _entManager.DeleteEntity(_objUid);
-        _objUid = default!;
-        _mapSystem.DeleteMap(_mapId);
-        _mapId = default!;
-        _entManager.DeleteEntity(_mapUid);
-    }
-
     // Moves an object off of a moving grid, checks for conservation of linear velocity.
     [Test]
     public void TestLinearVelocityOnlyMoveOffGrid()