From 9e0bdcd8d8db4671ac4ae9ef85095fff498ebe3b Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 23 Jan 2024 23:49:19 +1100
Subject: [PATCH] Fix thrusters (#24446)

---
 Content.Server/Physics/Controllers/MoverController.cs  | 4 ++--
 Content.Server/Shuttles/Components/ShuttleComponent.cs | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 41ca868508..c362507f19 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -249,8 +249,8 @@ namespace Content.Server.Physics.Controllers
 
             var horizIndex = vel.X > 0 ? 1 : 3; // east else west
             var vertIndex = vel.Y > 0 ? 2 : 0; // north else south
-            var horizComp = vel.X != 0 ? MathF.Pow(Vector2.Dot(vel, new (shuttle.BaseLinearThrust[horizIndex] / shuttle.LinearThrust[horizIndex], 0f)), 2) : 0;
-            var vertComp = vel.Y != 0 ? MathF.Pow(Vector2.Dot(vel, new (0f, shuttle.BaseLinearThrust[vertIndex] / shuttle.LinearThrust[vertIndex])), 2) : 0;
+            var horizComp = vel.X != 0 ? MathF.Pow(Vector2.Dot(vel, new (shuttle.LinearThrust[horizIndex] / shuttle.LinearThrust[horizIndex], 0f)), 2) : 0;
+            var vertComp = vel.Y != 0 ? MathF.Pow(Vector2.Dot(vel, new (0f, shuttle.LinearThrust[vertIndex] / shuttle.LinearThrust[vertIndex])), 2) : 0;
 
             return shuttle.BaseMaxLinearVelocity * vel * MathF.ReciprocalSqrtEstimate(horizComp + vertComp);
         }
diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
index 488f1d3a21..949d8ea5bb 100644
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -30,12 +30,6 @@ namespace Content.Server.Shuttles.Components
         [ViewVariables]
         public readonly float[] LinearThrust = new float[4];
 
-        /// <summary>
-        /// The cached thrust available for each cardinal direction, if all thrusters are T1
-        /// </summary>
-        [ViewVariables]
-        public readonly float[] BaseLinearThrust = new float[4];
-
         /// <summary>
         /// The thrusters contributing to each direction for impulse.
         /// </summary>
-- 
2.51.2