Fix #469 off-hand still places blocks when opening chisel

Chisel-Team · Sep 12, 2017 · 791b735 · 791b735
1 parent f7bb401
commit 791b735
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/main/java/team/chisel/common/item/ChiselController.java b/src/main/java/team/chisel/common/item/ChiselController.java
@@ -95,6 +95,16 @@ public static void onRightClickItem(PlayerInteractEvent.RightClickItem event) {
             }
         }
     }
+
+    @SubscribeEvent
+    public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
+        if (event.getHand() == EnumHand.OFF_HAND) {
+            ItemStack mainhandStack = event.getEntityPlayer().getHeldItemMainhand();
+            if (mainhandStack != null && mainhandStack.getItem() instanceof IChiselItem) {
+                event.setCanceled(true);
+            }
+        }
+    }
 
     private static void damageItem(ItemStack stack, EntityPlayer player) {
         stack.damageItem(1, player);