From f6a4851140a06f1def22c122dbf33d1483d0e77a Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:55:34 +0200 Subject: [PATCH] Derployer - Revert #5266 in favour of fixing #5674, (#6048) --- .../create/content/kinetics/deployer/DeployerHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java index 152af121a6..c0319a8f35 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java @@ -300,6 +300,9 @@ && safeOnUse(clickedState, world, clickedPos, player, hand, result).consumesActi return; if (useItem == DENY) return; + if (item instanceof BlockItem && !(item instanceof CartAssemblerBlockItem) + && !clickedState.canBeReplaced(new BlockPlaceContext(itemusecontext))) + return; // Reposition fire placement for convenience if (item == Items.FLINT_AND_STEEL) { @@ -322,9 +325,6 @@ && safeOnUse(clickedState, world, clickedPos, player, hand, result).consumesActi return; } - if (item instanceof BlockItem && !(item instanceof CartAssemblerBlockItem) - && !clickedState.canBeReplaced(new BlockPlaceContext(itemusecontext))) - return; if (item == Items.ENDER_PEARL) return; if (AllItemTags.DEPLOYABLE_DRINK.matches(item))