From e9ca330a339e05b64fa7d6c4402a4482a752570d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 3 Nov 2020 18:34:05 +0000 Subject: [PATCH] Fixed craftitemstack --- .../display/packets/PacketOpenWindowMerchant.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java index e84661fc..4e6ecb25 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java @@ -53,8 +53,11 @@ public final class PacketOpenWindowMerchant extends AbstractPacketAdapter { Object selling = fSelling.get(handle); // NMS Selling ItemStack modifiersField.setInt(fSelling, fSelling.getModifiers() & ~Modifier.FINAL); + String nmsVersion = EcoEnchantsPlugin.nmsVersion; // Fuck you spigot for making me do this + if(nmsVersion.equalsIgnoreCase("v1_16_R3")) nmsVersion = "v1_16_R2"; + // Reflectively access CraftItemStack.class for respective version - Class craftItemStack = Class.forName("org.bukkit.craftbukkit." + EcoEnchantsPlugin.nmsVersion + ".inventory.CraftItemStack"); + Class craftItemStack = Class.forName("org.bukkit.craftbukkit." + nmsVersion + ".inventory.CraftItemStack"); // Bukkit Result ItemStack from NMS Result ItemStack ItemStack nmsSelling = (ItemStack) craftItemStack.getMethod("asBukkitCopy", selling.getClass()).invoke(null, selling);