Require empty hand to shift click open covers (#388)

GregTechCEu · Dec 21, 2021 · 7bde516 · 7bde516
1 parent 6d477a4
commit 7bde516
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -393,7 +393,7 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac
                 MetaTileEntityUIFactory.INSTANCE.openUI(getHolder(), (EntityPlayerMP) playerIn);
             }
             return true;
-        } else if (playerIn.isSneaking()) {
+        } else if (playerIn.isSneaking() && playerIn.getHeldItemMainhand().isEmpty()) {
             EnumFacing hitFacing = hitResult.sideHit;
 
             CoverBehavior coverBehavior = hitFacing == null ? null : getCoverAtSide(hitFacing);

diff --git a/src/main/java/gregtech/api/pipenet/block/BlockPipe.java b/src/main/java/gregtech/api/pipenet/block/BlockPipe.java
@@ -298,7 +298,7 @@ public boolean onPipeActivated(World world, BlockPos pos, EntityPlayer entityPla
 
         EnumActionResult result = coverBehavior.onRightClick(entityPlayer, hand, hit);
         if (result == EnumActionResult.PASS) {
-            return entityPlayer.isSneaking() && coverBehavior.onScrewdriverClick(entityPlayer, hand, hit) != EnumActionResult.PASS;
+            return entityPlayer.isSneaking() && entityPlayer.getHeldItemMainhand().isEmpty() && coverBehavior.onScrewdriverClick(entityPlayer, hand, hit) != EnumActionResult.PASS;
         } else if (result == EnumActionResult.SUCCESS) {
             if (!world.isRemote)
                 GTTriggers.FIRST_COVER_PLACE.trigger((EntityPlayerMP) entityPlayer);