From 95e72e61d88426f02cd69e81321560d5f7668819 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 27 Dec 2022 12:47:59 +1100
Subject: [PATCH] Remove mob pushing (#13191)

---
 .../Systems/SharedMoverController.Pushing.cs  | 59 -------------------
 .../Movement/Systems/SharedMoverController.cs |  2 -
 2 files changed, 61 deletions(-)
 delete mode 100644 Content.Shared/Movement/Systems/SharedMoverController.Pushing.cs

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Pushing.cs b/Content.Shared/Movement/Systems/SharedMoverController.Pushing.cs
deleted file mode 100644
index da49bf7862..0000000000
--- a/Content.Shared/Movement/Systems/SharedMoverController.Pushing.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Content.Shared.CCVar;
-using Content.Shared.Movement.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Dynamics;
-
-namespace Content.Shared.Movement.Systems;
-
-public abstract partial class SharedMoverController
-{
-    private bool _pushingEnabled;
-
-    private void InitializePushing()
-    {
-        _configManager.OnValueChanged(CCVars.MobPushing, SetPushing, true);
-    }
-
-    private void SetPushing(bool value)
-    {
-        if (_pushingEnabled == value) return;
-
-        _pushingEnabled = value;
-
-        if (_pushingEnabled)
-        {
-            PhysicsSystem.KinematicControllerCollision += OnMobCollision;
-        }
-        else
-        {
-            PhysicsSystem.KinematicControllerCollision -= OnMobCollision;
-        }
-    }
-
-    private void ShutdownPushing()
-    {
-        if (_pushingEnabled)
-            PhysicsSystem.KinematicControllerCollision -= OnMobCollision;
-
-        _configManager.UnsubValueChanged(CCVars.MobPushing, SetPushing);
-    }
-
-    /// <summary>
-    ///     Fake pushing for player collisions.
-    /// </summary>
-    private void OnMobCollision(Fixture ourFixture, Fixture otherFixture, float frameTime, Vector2 worldNormal)
-    {
-        if (!_pushingEnabled)
-            return;
-
-        var otherBody = otherFixture.Body;
-
-        if (otherBody.BodyType != BodyType.Dynamic || !otherFixture.Hard)
-            return;
-
-        if (!EntityManager.TryGetComponent(ourFixture.Body.Owner, out MobMoverComponent? mobMover) || worldNormal == Vector2.Zero)
-            return;
-
-        PhysicsSystem.ApplyLinearImpulse(otherBody, -worldNormal * mobMover.PushStrengthVV * frameTime);
-    }
-}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 6a8b4ebfd7..771675c440 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -69,7 +69,6 @@ namespace Content.Shared.Movement.Systems
             InitializeFootsteps();
             InitializeInput();
             InitializeMob();
-            InitializePushing();
             InitializeRelay();
             _configManager.OnValueChanged(CCVars.RelativeMovement, SetRelativeMovement, true);
             _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
@@ -83,7 +82,6 @@ namespace Content.Shared.Movement.Systems
         {
             base.Shutdown();
             ShutdownInput();
-            ShutdownPushing();
             _configManager.UnsubValueChanged(CCVars.RelativeMovement, SetRelativeMovement);
             _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
         }