Fix mixin conflict with BetterCombat (#1115 #1126)

IzzelAliz · Dec 10, 2023 · 610953f · 610953f
1 parent 5e70607
commit 610953f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java b/.../src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java
@@ -759,7 +759,9 @@ public void handlePlayerAction(ServerboundPlayerActionPacket packetplayinblockdi
         switch (packetplayinblockdig_enumplayerdigtype) {
             case SWAP_ITEM_WITH_OFFHAND: {
                 if (!this.player.isSpectator()) {
-                    // ItemStack itemstack = this.player.getItemInHand(InteractionHand.OFF_HAND);
+                    // BetterCombat mixin compatibility
+                    // https://github.com/ZsoltMolnarrr/BetterCombat/blob/9090f08faf4a3e51256c8a7a13af94a80b6128c0/common/src/main/java/net/bettercombat/mixin/ServerPlayNetworkHandlerMixin.java
+                    ItemStack offhandStack = this.player.getItemInHand(InteractionHand.OFF_HAND);
                     var event = net.minecraftforge.common.ForgeHooks.onLivingSwapHandItems(this.player);
                     if (event.isCanceled()) return;
                     ItemStack itemstack = event.getItemSwappedToMainHand();