From 295a2c3ca01755797da940c7fda376f9cdd54a35 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Wed, 5 Mar 2025 19:25:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=9C=A8=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E6=A7=BD=E4=BD=8D=E5=92=8C=E6=8C=89=E9=94=AE=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=88=87=E6=8D=A2=E6=AD=A6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/atsuishio/superbwarfare/mixins/MinecraftMixin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/MinecraftMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/MinecraftMixin.java index ca25a6ba2..4db4b76db 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/MinecraftMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/MinecraftMixin.java @@ -58,12 +58,15 @@ public class MinecraftMixin { return; } + var seatIndex = vehicle.getSeatIndex(player); + // 数字键 武器切换 if (vehicle instanceof WeaponVehicleEntity weaponVehicle && !Screen.hasShiftDown() - && weaponVehicle.hasWeapon(vehicle.getSeatIndex(player)) + && weaponVehicle.hasWeapon(seatIndex) + && weaponVehicle.getWeaponType(seatIndex) != index ) { - ModUtils.PACKET_HANDLER.sendToServer(new SwitchVehicleWeaponMessage(vehicle.getSeatIndex(player), index, false)); + ModUtils.PACKET_HANDLER.sendToServer(new SwitchVehicleWeaponMessage(seatIndex, index, false)); ci.cancel(); } }