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)); } }