From bf09f6f667810600776b9fc12837b09caf3eb19e Mon Sep 17 00:00:00 2001
From: Atsuishio <842960157@qq.com>
Date: Wed, 2 Apr 2025 20:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=81=AB=E7=82=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vehicle/AnnihilatorEntity.java     |  6 +---
 .../entity/vehicle/Mk42Entity.java            | 34 +++++++++----------
 .../entity/vehicle/Mle1934Entity.java         |  7 +---
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
index f59b5a35d..b9df562ab 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
@@ -176,6 +176,7 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
         entityData.set(PITCH, Mth.wrapDegrees((float) (-(Mth.atan2(d1, d3) * 57.2957763671875))));
     }
 
+
     @Override
     public void positionRider(@NotNull Entity passenger, @NotNull MoveFunction callback) {
         if (!this.hasPassenger(passenger)) {
@@ -193,11 +194,6 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
         callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z);
     }
 
-    @Override
-    public @NotNull Vec3 getPassengerRidingPosition(@NotNull Entity entity) {
-        return super.getPassengerRidingPosition(entity).add(0, 0.75, 0);
-    }
-
     @Override
     public DamageModifier getDamageModifier() {
         return super.getDamageModifier()
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
index 0baad78f1..ea49af294 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
@@ -168,23 +168,6 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity
         entityData.set(YAW, Mth.wrapDegrees((float) (Mth.atan2(d2, d0) * 57.2957763671875) - 90.0F));
     }
 
-    @Override
-    public void positionRider(@NotNull Entity passenger, @NotNull MoveFunction callback) {
-        if (!this.hasPassenger(passenger)) {
-            return;
-        }
-
-        Matrix4f transform = getVehicleFlatTransform(1);
-
-        float x = 0f;
-        float y = 2.3f;
-        float z = 0f;
-
-        Vector4f worldPosition = transformPosition(transform, x, y, z);
-        passenger.setPos(worldPosition.x, worldPosition.y, worldPosition.z);
-        callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z);
-    }
-
     @Override
     public DamageModifier getDamageModifier() {
         return super.getDamageModifier()
@@ -271,6 +254,23 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity
         this.discard();
     }
 
+    @Override
+    public void positionRider(@NotNull Entity passenger, @NotNull MoveFunction callback) {
+        if (!this.hasPassenger(passenger)) {
+            return;
+        }
+
+        Matrix4f transform = getVehicleFlatTransform(1);
+
+        float x = 0f;
+        float y = 2.3f;
+        float z = 0f;
+
+        Vector4f worldPosition = transformPosition(transform, x, y, z);
+        passenger.setPos(worldPosition.x, worldPosition.y, worldPosition.z);
+        callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z);
+    }
+
     @Override
     public void vehicleShoot(Player player, int type) {
         if (this.entityData.get(COOL_DOWN) > 0) return;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
index e8182c4f7..a25570335 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
@@ -176,7 +176,7 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt
         return 2.16F;
     }
 
-    @Override
+
     public void positionRider(@NotNull Entity passenger, @NotNull MoveFunction callback) {
         if (!this.hasPassenger(passenger)) {
             return;
@@ -193,11 +193,6 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt
         callback.accept(passenger, worldPosition.x, worldPosition.y, worldPosition.z);
     }
 
-    @Override
-    public @NotNull Vec3 getPassengerRidingPosition(@NotNull Entity entity) {
-        return super.getPassengerRidingPosition(entity).add(0, -0.075, 0);
-    }
-
     @Override
     public DamageModifier getDamageModifier() {
         return super.getDamageModifier()