From 1e7ff74eb6e74ba6053f101119ff8c30ca4bdae7 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Thu, 31 Oct 2024 12:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/entity/MortarEntity.java    | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java
index c67e850ed..6c511fd11 100644
--- a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java
+++ b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java
@@ -5,7 +5,6 @@ import net.mcreator.superbwarfare.entity.projectile.MortarShellEntity;
 import net.mcreator.superbwarfare.init.ModEntities;
 import net.mcreator.superbwarfare.init.ModItems;
 import net.mcreator.superbwarfare.init.ModSounds;
-import net.minecraft.core.NonNullList;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -63,6 +62,10 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
         this.entityData.define(PITCH, 70f);
     }
 
+    @Override
+    public boolean isPickable() {
+        return !this.isRemoved();
+    }
 
     @Override
     protected float getEyeHeight(Pose pPose, EntityDimensions pSize) {
@@ -74,16 +77,6 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
         return NetworkHooks.getEntitySpawningPacket(this);
     }
 
-    @Override
-    public Iterable<ItemStack> getArmorSlots() {
-        return NonNullList.withSize(1, ItemStack.EMPTY);
-    }
-
-
-    @Override
-    public void setItemSlot(EquipmentSlot pSlot, ItemStack pStack) {
-    }
-
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (source.is(DamageTypes.IN_FIRE))
@@ -127,7 +120,6 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
 
     @Override
     public InteractionResult interactAt(Player player, Vec3 pVec, InteractionHand pHand) {
-
         player.displayClientMessage(Component.literal("114"), true);
         if (!this.level().isClientSide) {
             ItemStack mainHandItem = player.getMainHandItem();
@@ -239,16 +231,11 @@ public class MortarEntity extends Entity implements GeoEntity, AnimatedEntity {
         if (this.entityData.get(FIRE_TIME) > 0) {
             this.entityData.set(FIRE_TIME, this.entityData.get(FIRE_TIME) - 1);
         }
-            this.setXRot(-Mth.clamp(entityData.get(PITCH), 20, 89));
-            this.xRotO = this.getXRot();
+        this.setXRot(-Mth.clamp(entityData.get(PITCH), 20, 89));
+        this.xRotO = this.getXRot();
         this.refreshDimensions();
     }
 
-    @Override
-    public boolean isPushable() {
-        return false;
-    }
-
 //    @Override
 //    public HumanoidArm getMainArm() {
 //        return HumanoidArm.RIGHT;