From 6cd9fa9fb2790494ebd5d8e8edb11167fe50bc5c Mon Sep 17 00:00:00 2001 From: David Queneau <748280+davidqueneau@users.noreply.github.com> Date: Fri, 5 Mar 2021 20:14:24 -0800 Subject: [PATCH] Fixed turtle bone meal usage --- .../turtle/core/TurtlePlaceCommand.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 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 index 2f759f242..2e2a2000e 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java @@ -22,6 +22,7 @@ import dan200.computercraft.shared.util.DirectionUtil; import dan200.computercraft.shared.util.DropConsumer; import dan200.computercraft.shared.util.InventoryUtil; import dan200.computercraft.shared.util.WorldUtil; +import net.minecraft.item.*; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.BlockState; @@ -29,16 +30,6 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.SignBlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.BoatItem; -import net.minecraft.item.BucketItem; -import net.minecraft.item.GlassBottleItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPlacementContext; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUsageContext; -import net.minecraft.item.LilyPadItem; -import net.minecraft.item.SignItem; import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -304,11 +295,9 @@ public class TurtlePlaceCommand implements ITurtleCommand { BlockEntity existingTile = turtle.getWorld() .getBlockEntity(position); - if (placementContext.canPlace()) { - if (stackCopy.useOnBlock(context) == ActionResult.SUCCESS) { - placed = true; - turtlePlayer.loadInventory(stackCopy); - } + if (stackCopy.useOnBlock(context) == ActionResult.SUCCESS) { + placed = true; + turtlePlayer.loadInventory(stackCopy); } if (!placed && (item instanceof BucketItem || item instanceof BoatItem || item instanceof LilyPadItem || item instanceof GlassBottleItem)) {