Make rats not bring back items if player inv is full

Ladysnake · Jul 27, 2021 · 927aa43 · 927aa43
1 parent e6f1fd6
commit 927aa43
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/main/java/ladysnake/ratsmischief/common/entity/RatEntity.java b/src/main/java/ladysnake/ratsmischief/common/entity/RatEntity.java
@@ -145,7 +145,6 @@ protected void initEquipment(LocalDifficulty difficulty) {
     }
 
 
-
     @Override
     public EntityData initialize(ServerWorldAccess world, LocalDifficulty difficulty, SpawnReason spawnReason, @Nullable EntityData entityData, @Nullable NbtCompound entityTag) {
         this.initEquipment(difficulty);
@@ -851,24 +850,22 @@ public BringItemToOwnerGoal(TameableEntity tameable, double speed, float minDist
         public void tick() {
             super.tick();
 
-            if (RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive()) {
+            if (RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive() && ((PlayerEntity) RatEntity.this.getOwner()).getInventory().getEmptySlot() >= 0) {
                 if (RatEntity.this.squaredDistanceTo(RatEntity.this.getOwner()) <= 3.0f && RatEntity.this.getOwner() instanceof PlayerEntity) {
-                    if (((PlayerEntity) RatEntity.this.getOwner()).getInventory().getEmptySlot() >= 0) {
-                        RatEntity.this.dropStack(RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND));
-                        RatEntity.this.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-                    }
+                    RatEntity.this.dropStack(RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND));
+                    RatEntity.this.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                 }
             }
         }
 
         @Override
         public boolean canStart() {
-            return super.canStart() && !RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND).isEmpty() && RatEntity.this.isTamed() && !RatEntity.this.isSitting() && !RatEntity.this.isEating() && RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive();
+            return super.canStart() && !RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND).isEmpty() && RatEntity.this.isTamed() && !RatEntity.this.isSitting() && !RatEntity.this.isEating() && RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive() && ((PlayerEntity) RatEntity.this.getOwner()).getInventory().getEmptySlot() >= 0;
         }
 
         @Override
         public boolean shouldContinue() {
-            return super.shouldContinue() && !RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND).isEmpty() && RatEntity.this.isTamed() && !RatEntity.this.isSitting() && !RatEntity.this.isEating() && RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive();
+            return super.shouldContinue() && !RatEntity.this.getEquippedStack(EquipmentSlot.MAINHAND).isEmpty() && RatEntity.this.isTamed() && !RatEntity.this.isSitting() && !RatEntity.this.isEating() && RatEntity.this.getOwner() != null && RatEntity.this.getOwner().isAlive() && ((PlayerEntity) RatEntity.this.getOwner()).getInventory().getEmptySlot() >= 0;
         }
     }