diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java index 8f976c14..6460b3ef 100644 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java +++ b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/VillagerTrade.java @@ -19,7 +19,7 @@ public final class VillagerTrade implements VillagerTradeProxy { fResult.setAccessible(true); ItemStack result = merchantRecipe.getResult(); - Display.display(result); + Display.displayAndFinalize(result); fResult.set(merchantRecipe, result); // Get NMS MerchantRecipe from CraftMerchantRecipe @@ -31,7 +31,7 @@ public final class VillagerTrade implements VillagerTradeProxy { fSelling.setAccessible(true); ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem); - Display.display(selling); + Display.displayAndFinalize(selling); fSelling.set(handle, CraftItemStack.asNMSCopy(selling)); } catch (IllegalAccessException | NoSuchFieldException e) { e.printStackTrace(); diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java index 23ac8f25..16871fe3 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java +++ b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/eco/proxy/v1_16_R1/VillagerTrade.java @@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy { Field fResult = MerchantRecipe.class.getDeclaredField("result"); fResult.setAccessible(true); ItemStack result = merchantRecipe.getResult(); - Display.display(result); + Display.displayAndFinalize(result); fResult.set(merchantRecipe, result); // Get NMS MerchantRecipe from CraftMerchantRecipe @@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy { fSelling.setAccessible(true); ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem); - Display.display(selling); + Display.displayAndFinalize(selling); fSelling.set(handle, CraftItemStack.asNMSCopy(selling)); } catch (IllegalAccessException | NoSuchFieldException e) { diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java index 6556a8cf..08b06579 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java +++ b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/eco/proxy/v1_16_R2/VillagerTrade.java @@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy { Field fResult = MerchantRecipe.class.getDeclaredField("result"); fResult.setAccessible(true); ItemStack result = merchantRecipe.getResult(); - Display.display(result); + Display.displayAndFinalize(result); fResult.set(merchantRecipe, result); // Get NMS MerchantRecipe from CraftMerchantRecipe @@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy { fSelling.setAccessible(true); ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem); - Display.display(selling); + Display.displayAndFinalize(selling); fSelling.set(handle, CraftItemStack.asNMSCopy(selling)); } catch (IllegalAccessException | NoSuchFieldException e) { diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java index 9dbf9b26..8778a90d 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/VillagerTrade.java @@ -18,7 +18,7 @@ public final class VillagerTrade implements VillagerTradeProxy { Field fResult = MerchantRecipe.class.getDeclaredField("result"); fResult.setAccessible(true); ItemStack result = merchantRecipe.getResult(); - Display.display(result); + Display.displayAndFinalize(result); fResult.set(merchantRecipe, result); // Get NMS MerchantRecipe from CraftMerchantRecipe @@ -30,7 +30,7 @@ public final class VillagerTrade implements VillagerTradeProxy { fSelling.setAccessible(true); ItemStack selling = CraftItemStack.asBukkitCopy(handle.sellingItem); - Display.display(selling); + Display.displayAndFinalize(selling); fSelling.set(handle, CraftItemStack.asNMSCopy(selling)); } catch (IllegalAccessException | NoSuchFieldException e) { diff --git a/eco-util/src/main/java/com/willfp/eco/util/display/Display.java b/eco-util/src/main/java/com/willfp/eco/util/display/Display.java index 0c647418..db700686 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/display/Display.java +++ b/eco-util/src/main/java/com/willfp/eco/util/display/Display.java @@ -55,11 +55,6 @@ public class Display { * @return The itemstack. */ public ItemStack display(@NotNull final ItemStack itemStack) { - if (isFinalized(itemStack)) { - unfinalize(itemStack); - return itemStack; - } - Map pluginVarArgs = new HashMap<>(); for (DisplayPriority priority : DisplayPriority.values()) { @@ -113,9 +108,8 @@ public class Display { * @return The itemstack. */ public ItemStack revert(@NotNull final ItemStack itemStack) { - if (isFinalized(itemStack)) { + if (Display.isFinalized(itemStack)) { unfinalize(itemStack); - return itemStack; } if (!itemStack.hasItemMeta()) {