fix potential bug

Signed-off-by: Devan-Kerman <[email protected]>
MariaTheDinkus · Sep 9, 2020 · 5184883 · 5184883
1 parent 0c45112
commit 5184883
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
@@ -230,15 +230,15 @@ private static ItemStack deployOnEntity(@Nonnull ItemStack stack, final ITurtleA
 
         if (cancelResult != null && cancelResult.isAccepted()) {
             placed = true;
-        } else {
+        } else if (hitEntity instanceof LivingEntity) {
             // See EntityPlayer.interactOn
             cancelResult = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND);
             if (cancelResult != null && cancelResult.isAccepted()) {
                 placed = true;
             } else if (cancelResult == null) {
                 if (hitEntity.interact(turtlePlayer, Hand.MAIN_HAND) == ActionResult.CONSUME) {
                     placed = true;
-                } else if (hitEntity instanceof LivingEntity) {
+                } else {
                     placed = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND)
                                       .isAccepted();
                     if (placed) {

diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
@@ -26,12 +26,14 @@
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.NamedScreenHandlerFactory;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;