From bce250c0c14974ec3974d581d7c261fd563aa357 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:45:14 -0400 Subject: [PATCH 1/2] Fix enchant not working with offhand --- .../java/com/earth2me/essentials/commands/Commandenchant.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java index 4a6292f181a..19a6c4c9830 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java @@ -3,7 +3,6 @@ import com.earth2me.essentials.Enchantments; import com.earth2me.essentials.MetaItemStack; import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.Inventories; import com.earth2me.essentials.utils.StringUtil; import com.google.common.collect.Lists; import org.bukkit.Material; @@ -57,7 +56,7 @@ protected void run(final Server server, final User user, final String commandLab final MetaItemStack metaStack = new MetaItemStack(stack); final Enchantment enchantment = metaStack.getEnchantment(user, args[0]); metaStack.addEnchantment(user.getSource(), ess.getSettings().allowUnsafeEnchantments() && user.isAuthorized("essentials.enchantments.allowunsafe"), enchantment, level); - Inventories.setItemInMainHand(user.getBase(), metaStack.getItemStack()); + stack.setItemMeta(metaStack.getItemStack().getItemMeta()); user.getBase().updateInventory(); final String enchantName = enchantment.getName().toLowerCase(Locale.ENGLISH).replace('_', ' '); if (level == 0) { From 1c3659fd2feb3b0fc1bd65dbe0246decfc63a946 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:58:26 -0400 Subject: [PATCH 2/2] Revert duel hand behavior of /book command --- .../main/java/com/earth2me/essentials/commands/Commandbook.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbook.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbook.java index bec93ba1ca4..a6a87499b90 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbook.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbook.java @@ -25,7 +25,7 @@ public Commandbook() { @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - final ItemStack item = user.getItemInHand(); + final ItemStack item = Inventories.getItemInMainHand(user.getBase()); final String player = user.getName(); if (item.getType() == Material.WRITTEN_BOOK) { final BookMeta bmeta = (BookMeta) item.getItemMeta();