From e8a7cd05c9e19a56d41c08d11f86acad759f4c3d Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 2 Jan 2025 10:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=BD=E5=85=B7=E8=BF=90?= =?UTF-8?q?=E5=8A=A8=E9=83=A8=E4=BB=B6=E5=B8=A7=E7=8E=87=E4=BD=8E=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/entity/SpeedboatEntity.java | 10 +++++----- .../superbwarfare/entity/WheelChairEntity.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java index 1581f3bf3..29e982dcd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java @@ -187,6 +187,11 @@ public class SpeedboatEntity extends MobileVehicleEntity implements GeoEntity, I @Override public void baseTick() { + turretYRotO = this.getTurretYRot(); + turretXRotO = this.getTurretXRot(); + rotorRotO = this.getRotorRot(); + rudderRotO = this.getRudderRot(); + super.baseTick(); if (this.entityData.get(HEAT) > 0) { @@ -205,11 +210,6 @@ public class SpeedboatEntity extends MobileVehicleEntity implements GeoEntity, I this.entityData.set(AMMO, this.getItemStacks().stream().filter(stack -> stack.is(ModItems.HEAVY_AMMO.get())).mapToInt(ItemStack::getCount).sum()); } - turretYRotO = this.getTurretYRot(); - turretXRotO = this.getTurretXRot(); - rotorRotO = this.getRotorRot(); - rudderRotO = this.getRudderRot(); - Entity driver = this.getFirstPassenger(); if (driver instanceof Player player) { if (this.entityData.get(HEAT) > 100) { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java index 9f8df27a0..ea1286e7b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java @@ -102,7 +102,8 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { @Override public void baseTick() { - super.baseTick(); + leftWheelRotO = this.getLeftWheelRot(); + rightWheelRotO = this.getRightWheelRot(); if (jumpCoolDown > 0 && onGround()) { jumpCoolDown--; @@ -112,8 +113,7 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { handBusyTime--; } - leftWheelRotO = this.getLeftWheelRot(); - rightWheelRotO = this.getRightWheelRot(); + super.baseTick(); this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.048, 0.0)); if (this.onGround()) {