Fix double event firing with offhand

Layers-of-Railways · Nov 2, 2024 · 7bb3acf · 7bb3acf
1 parent e96a388
commit 7bb3acf
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java b/common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java
@@ -69,8 +69,11 @@ public static InteractionResult onUseBlock(Player player, Level level, Interacti
         BlockPos pos = hitResult.getBlockPos();
         BlockState state = level.getBlockState(pos);
 
-        if (!level.isClientSide() && !player.getOffhandItem().isEmpty() && !(player.getOffhandItem().getItem() instanceof BlockItem) &&
-                hand.equals(InteractionHand.MAIN_HAND) && state.getBlock() instanceof VendorBlock vb) {
+        boolean offhandFix = !level.isClientSide()
+                && !player.getOffhandItem().isEmpty()
+                && !(player.getOffhandItem().getItem() instanceof BlockItem) &&
+                hand.equals(InteractionHand.MAIN_HAND);
+        if ((offhandFix || player.isShiftKeyDown()) && state.getBlock() instanceof VendorBlock vb) {
             return vb.use(state, level, pos, player, hand, hitResult);
         }