From 380dbf79b7b4d5d2805556b273b7f821d13c6043 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Tue, 8 Jul 2025 22:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BB=9A=E8=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atsuishio/superbwarfare/client/ClickHandler.java | 12 +++++-------
 .../superbwarfare/entity/vehicle/MortarEntity.java   |  8 +++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
index 80e452516..e8b0d1f02 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
@@ -213,16 +213,14 @@ public class ClickHandler {
             event.setCanceled(true);
         }
 
-        Entity looking = TraceTool.findLookingEntity(player, 6);
-        if (looking == null) return;
-        if (looking instanceof MortarEntity && player.isShiftKeyDown()) {
-            PacketDistributor.sendToServer(new AdjustMortarAngleMessage(scroll));
+        if (player.isUsingItem() && player.getUseItem().is(ModItems.ARTILLERY_INDICATOR.get())) {
+            artilleryIndicatorCustomZoom = Mth.clamp(artilleryIndicatorCustomZoom + 0.4 * scroll, 0, 9);
             event.setCanceled(true);
         }
 
-        //TODO 为啥还能滚轮换物品？
-        if (player.isUsingItem() && player.getUseItem().is(ModItems.ARTILLERY_INDICATOR.get())) {
-            artilleryIndicatorCustomZoom = Mth.clamp(artilleryIndicatorCustomZoom + 0.4 * scroll, 0, 9);
+        Entity looking = TraceTool.findLookingEntity(player, 6);
+        if (looking instanceof MortarEntity && player.isShiftKeyDown()) {
+            PacketDistributor.sendToServer(new AdjustMortarAngleMessage(scroll));
             event.setCanceled(true);
         }
     }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java
index 137e82933..6283f3965 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java
@@ -60,6 +60,9 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, Container,
 
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
 
+    private LivingEntity shooter = null;
+    public ItemStack stack = ItemStack.EMPTY;
+
     public MortarEntity(EntityType<MortarEntity> type, Level level) {
         super(type, level);
     }
@@ -140,9 +143,6 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, Container,
         return this.entityData.get(OWNER_UUID).orElse(null);
     }
 
-
-    private LivingEntity shooter = null;
-
     public void fire(@Nullable LivingEntity shooter) {
         if (!(this.stack.getItem() instanceof MortarShell)) return;
 
@@ -356,8 +356,6 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, Container,
         return this.cache;
     }
 
-    public ItemStack stack = ItemStack.EMPTY;
-
     @Override
     public int getContainerSize() {
         return 1;