From 610953f028c496e631c2e249351dbf36d5d14937 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 10 Dec 2023 22:24:21 +0800 Subject: [PATCH] Fix mixin conflict with BetterCombat (#1115 #1126) --- .../common/mixin/core/network/ServerPlayNetHandlerMixin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java index 8a4cf885..2ab6d4ad 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java @@ -759,7 +759,9 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB 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();