diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 9935f118bd..5e0e20d96a 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -291,7 +291,7 @@ namespace Content.Shared.CCVar /// Technically client doesn't need to know about it but this may prevent a bug in the distant future so it stays. /// public static readonly CVarDef MobPushing = - CVarDef.Create("physics.mob_pushing", true, CVar.REPLICATED); + CVarDef.Create("physics.mob_pushing", false, CVar.REPLICATED); /* * Lobby music diff --git a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs index 389df8402a..121c28836b 100644 --- a/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs +++ b/Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs @@ -16,7 +16,7 @@ namespace Content.Shared.Movement.EntitySystems public override void Initialize() { base.Initialize(); - Get().KinematicControllerCollision += HandleCollisionMessage; + Get().KinematicControllerCollision += OnMobCollision; IoCManager.Resolve().OnValueChanged(CCVars.MobPushing, SetPushing, true); } @@ -29,13 +29,13 @@ namespace Content.Shared.Movement.EntitySystems { base.Shutdown(); IoCManager.Resolve().UnsubValueChanged(CCVars.MobPushing, SetPushing); - Get().KinematicControllerCollision -= HandleCollisionMessage; + Get().KinematicControllerCollision -= OnMobCollision; } /// /// Fake pushing for player collisions. /// - private void HandleCollisionMessage(Fixture ourFixture, Fixture otherFixture, float frameTime, Vector2 worldNormal) + private void OnMobCollision(Fixture ourFixture, Fixture otherFixture, float frameTime, Vector2 worldNormal) { if (!_pushingEnabled) return;