From 754fc1a1e76c14e07536337cf2ac6ef51e8083ac Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Mon, 15 Dec 2025 17:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BF=AE=E5=A4=8Dha?= =?UTF-8?q?nd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../craftengine/bukkit/item/behavior/AxeItemBehavior.java | 2 +- .../craftengine/bukkit/util/EquipmentSlotUtils.java | 4 ++-- .../core/plugin/context/function/DamageItemFunction.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java index 619567244..06518be06 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java @@ -107,7 +107,7 @@ public class AxeItemBehavior extends ItemBehavior { player.swingHand(context.getHand()); } // shrink item amount - item.hurtAndBreak(1, player, context.getHand() == InteractionHand.MAIN_HAND ? EquipmentSlot.MAIN_HAND : EquipmentSlot.OFF_HAND); + item.hurtAndBreak(1, player, context.getHand() == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND); } return InteractionResult.SUCCESS_AND_CANCEL; } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/EquipmentSlotUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/EquipmentSlotUtils.java index d334f9f47..6717c955b 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/EquipmentSlotUtils.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/EquipmentSlotUtils.java @@ -8,8 +8,8 @@ public final class EquipmentSlotUtils { public static Object toNMSEquipmentSlot(EquipmentSlot equipmentSlot) { return switch (equipmentSlot) { - case MAIN_HAND -> CoreReflections.instance$EquipmentSlot$MAINHAND; - case OFF_HAND -> CoreReflections.instance$EquipmentSlot$OFFHAND; + case MAINHAND -> CoreReflections.instance$EquipmentSlot$MAINHAND; + case OFFHAND -> CoreReflections.instance$EquipmentSlot$OFFHAND; case FEET -> CoreReflections.instance$EquipmentSlot$FEET; case LEGS -> CoreReflections.instance$EquipmentSlot$LEGS; case CHEST -> CoreReflections.instance$EquipmentSlot$CHEST; diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/DamageItemFunction.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/DamageItemFunction.java index d1580f33b..e8fdd84a8 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/DamageItemFunction.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/DamageItemFunction.java @@ -33,7 +33,7 @@ public class DamageItemFunction extends AbstractConditional } else if (item == null) { return; } - EquipmentSlot slot = hand == null ? null : hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAIN_HAND : EquipmentSlot.OFF_HAND; + EquipmentSlot slot = hand == null ? null : hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND; item.hurtAndBreak(amount.getInt(ctx), player, slot); }