From 76e808b8b1dbc63e7e63f6f774bee606eefd7ec5 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 15 Jul 2021 12:09:43 +0200 Subject: [PATCH] Packet changes --- .../java/com/willfp/eco/spigot/display/PacketAutoRecipe.java | 2 +- .../willfp/eco/spigot/display/PacketOpenWindowMerchant.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java index 44d9a460..46c1852b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java @@ -24,7 +24,7 @@ public class PacketAutoRecipe extends AbstractPacketAdapter { @Override public void onSend(@NotNull final PacketContainer packet, @NotNull final Player player) { - if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(packet.getMinecraftKeys().getValues().get(0).getFullKey().split(":")[0])) { + if (!EcoPlugin.getPluginNames().contains(packet.getMinecraftKeys().getValues().get(0).getFullKey().split(":")[0])) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java index 43a5969b..cb6f9318 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java @@ -34,6 +34,11 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter { @NotNull final PacketEvent event) { List recipes = new ArrayList<>(); + + /* + This awful, awful bit of code exists to fix a bug that existed in EcoEnchants + for too many versions. + */ if (this.getPlugin().getConfigYml().getBool("villager-display-fix")) { for (MerchantRecipe recipe : packet.getMerchantRecipeLists().read(0)) { ItemStack result = recipe.getResult();