From 29b0c7bc8501756863a2e3006b573fc98578d4d9 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 15 Dec 2024 16:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=AB=E8=89=87=E7=89=A9?= =?UTF-8?q?=E5=93=81=E5=AD=98=E5=82=A8=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/atsuishio/superbwarfare/entity/SpeedboatEntity.java | 3 ++- .../java/com/atsuishio/superbwarfare/menu/SpeedboatMenu.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java index 07bac8b9f..343d0c241 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java @@ -184,7 +184,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity, @Override public void remove(Entity.RemovalReason pReason) { - if (!this.level().isClientSide && pReason.shouldDestroy()) { + if (!this.level().isClientSide && pReason != RemovalReason.DISCARDED) { Containers.dropContents(this.level(), this, this); } @@ -248,6 +248,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity, if (!player.addItem(stack)) { player.drop(stack, false); } + this.remove(RemovalReason.DISCARDED); this.discard(); return InteractionResult.sidedSuccess(this.level().isClientSide()); } else { diff --git a/src/main/java/com/atsuishio/superbwarfare/menu/SpeedboatMenu.java b/src/main/java/com/atsuishio/superbwarfare/menu/SpeedboatMenu.java index 703956d93..1ccd2fdf4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/menu/SpeedboatMenu.java +++ b/src/main/java/com/atsuishio/superbwarfare/menu/SpeedboatMenu.java @@ -33,7 +33,7 @@ public class SpeedboatMenu extends AbstractContainerMenu { for (int j = 0; j < this.containerRows; ++j) { for (int k = 0; k < 17; ++k) { - this.addSlot(new Slot(pContainer, k + j * 9, 8 + k * 18, 18 + j * 18)); + this.addSlot(new Slot(pContainer, k + j * 17, 8 + k * 18, 18 + j * 18)); } }