From c6f69417627b3890db3e1e2048487de9f62881f3 Mon Sep 17 00:00:00 2001 From: Sunekaer - MAC Date: Mon, 15 Jan 2024 13:08:44 +0100 Subject: [PATCH] fix enchant command --- .../sunekaer/toolkit/commands/items/EnchantCommand.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/sunekaer/toolkit/commands/items/EnchantCommand.java b/common/src/main/java/com/sunekaer/toolkit/commands/items/EnchantCommand.java index b8d307e..96c9b3a 100644 --- a/common/src/main/java/com/sunekaer/toolkit/commands/items/EnchantCommand.java +++ b/common/src/main/java/com/sunekaer/toolkit/commands/items/EnchantCommand.java @@ -48,14 +48,13 @@ private static int enchant(CommandContext context, Holder.Re CommandSourceStack source = context.getSource(); Enchantment enchantment = (Enchantment)arg2.value(); - var enchant = enchantment.value(); var player = source.getPlayer(); var mainHandItem = getItemInHand(player); if (mainHandItem == null) { throw ERROR_MISSING_PLAYER.create(); } - if (!enchant.canEnchant(mainHandItem) || !EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(mainHandItem).keySet(), enchant)) { + if (!enchantment.canEnchant(mainHandItem) || !EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(mainHandItem).keySet(), enchantment)) { throw ERROR_INCOMPATIBLE.create(mainHandItem.getItem().getName(mainHandItem).getString()); } @@ -78,11 +77,11 @@ private static int removeEnchantment(CommandContext context, throw ERROR_MISSING_ENCHANTMENT.create(mainHandItem.getItem().getName(mainHandItem).getString(), enchantment.getFullname(1)); } - boolean success = EnchantmentHacks.removeEnchantment(mainHandItem, enchant); + boolean success = EnchantmentHacks.removeEnchantment(mainHandItem, enchantment); if (success) { source.sendSuccess(() -> Component.translatable("commands.toolkit.remove_enchant.success", mainHandItem.getItem().getName(mainHandItem).getString(), enchantment.getFullname(1).getString()), false); } else { - source.sendFailure(Component.translatable("commands.toolkit.remove_enchant.failed", mainHandItem.getItem().getName(mainHandItem).getString(), enchant.getFullname(1).getString())); + source.sendFailure(Component.translatable("commands.toolkit.remove_enchant.failed", mainHandItem.getItem().getName(mainHandItem).getString(), enchantment.getFullname(1).getString())); } return success ? 1 : 0; }