From 2edc769362dc2e1b26e14a680b9ffc6c2426c081 Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Sun, 13 Jul 2025 22:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=86=99=E6=92=AC=E6=A3=8D?= =?UTF-8?q?=E6=95=B2=E4=B8=80=E4=B8=8B=E5=8F=91=E5=B0=84=E4=B8=80=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vehicle/Type63Entity.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java index 40f68c5d8..621bf9e2c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java @@ -190,20 +190,24 @@ public class Type63Entity extends ContainerMobileVehicleEntity implements GeoEnt setChanged(); if (stack.is(ModTags.Items.CROWBAR)) { - if (player.isShiftKeyDown() && this.getPassengers().isEmpty()) { - ItemStack container = ContainerBlockItem.createInstance(this); - if (!player.addItem(container)) { - player.drop(container, false); + if (player.isShiftKeyDown()) { + if (this.getPassengers().isEmpty()) { + ItemStack container = ContainerBlockItem.createInstance(this); + if (!player.addItem(container)) { + player.drop(container, false); + } + this.remove(RemovalReason.DISCARDED); + this.discard(); + return InteractionResult.SUCCESS; } - this.remove(RemovalReason.DISCARDED); - this.discard(); - return InteractionResult.SUCCESS; - } - - for (int i = 0; i < 12; i++) { - if (!items.get(i).isEmpty()) { - items.remove(i); - break; + } else { + //TODO 正确实现扣除炮弹 + for (int i = 0; i < 12; i++) { + if (items.get(i).getItem() instanceof MediumRocketItem) { + items.remove(i); + player.swing(InteractionHand.MAIN_HAND); + break; + } } } }