Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixin conflict with BetterCombat (#1115 #1126)

Browse Source
This commit is contained in:
IzzelAliz 2023-12-10 22:24:21 +08:00
parent 5e70607eb2
commit 610953f028
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java
View File

@ -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();