fix pipe tool click with offhand shield (#2065)

GregTechCEu · Oct 25, 2023 · 98e0d1c · 98e0d1c
1 parent fefdbd5
commit 98e0d1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/gregtech/api/pipenet/block/BlockPipe.java b/src/main/java/gregtech/api/pipenet/block/BlockPipe.java
@@ -408,6 +408,7 @@ public EnumActionResult onPipeToolUsed(World world, BlockPos pos, ItemStack stac
                 return EnumActionResult.SUCCESS;
             }
             entityPlayer.swingArm(hand);
+            return EnumActionResult.SUCCESS;
         }
         return EnumActionResult.PASS;
     }

diff --git a/src/main/java/gregtech/common/EventHandlers.java b/src/main/java/gregtech/common/EventHandlers.java
@@ -5,6 +5,7 @@
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.pipenet.longdist.LongDistanceNetwork;
+import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.util.CapesRegistry;
 import gregtech.api.util.GTUtility;
@@ -79,9 +80,14 @@ public static void onEntitySpawn(LivingSpawnEvent.SpecialSpawn event) {
 
     @SubscribeEvent
     public static void onPlayerInteractionRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
-        if (event.getWorld().getTileEntity(event.getPos()) instanceof IGregTechTileEntity) {
+        // fix sneaking with shields not allowing tool interactions with GT machines
+        TileEntity tileEntity = event.getWorld().getTileEntity(event.getPos());
+        if (tileEntity instanceof IGregTechTileEntity) {
+            event.setUseBlock(Event.Result.ALLOW);
+        } else if (tileEntity instanceof IPipeTile<?,?>) {
             event.setUseBlock(Event.Result.ALLOW);
         }
+
         ItemStack stack = event.getItemStack();
         if (!stack.isEmpty() && stack.getItem() == Items.FLINT_AND_STEEL) {
             if (!event.getWorld().isRemote