diff --git a/Plugin/pom.xml b/Plugin/pom.xml index 1191ddce..e875664e 100644 --- a/Plugin/pom.xml +++ b/Plugin/pom.xml @@ -168,14 +168,6 @@ worldguard-bukkit 7.0.4-SNAPSHOT provided - com.github.TechFortress 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 855b19d8..e84661fc 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 @@ -27,6 +27,9 @@ public final class PacketOpenWindowMerchant extends AbstractPacketAdapter { recipes = recipes.stream().peek(merchantRecipe -> { try { + if(!EnchantmentTarget.ALL.getMaterials().contains(merchantRecipe.getResult().getType())) + return; + // Enables removing final modifier Field modifiersField = Field.class.getDeclaredField("modifiers"); modifiersField.setAccessible(true); @@ -36,8 +39,6 @@ public final class PacketOpenWindowMerchant extends AbstractPacketAdapter { fResult.setAccessible(true); ItemStack result = EnchantDisplay.displayEnchantments(merchantRecipe.getResult()); result = EnchantDisplay.addV(result); - if(!EnchantmentTarget.ALL.getMaterials().contains(result.getType())) - return; fResult.set(merchantRecipe, result); // Get NMS MerchantRecipe from CraftMerchantRecipe