From 433ab547cb84bcb418e1756ec89d4e04ebbc3b21 Mon Sep 17 00:00:00 2001 From: hyperdefined Date: Sun, 21 May 2023 23:49:07 -0400 Subject: [PATCH] minor adjustments --- .../hyper/toolstats/events/VillagerTrade.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java index fda5604..994efe4 100644 --- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java +++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java @@ -66,20 +66,21 @@ public class VillagerTrade implements Listener { if (event.getSlotType() == InventoryType.SlotType.RESULT) { ItemStack item = event.getCurrentItem(); // only check items we want - if (ItemChecker.isValidItem(item.getType())) { - // if the player shift clicks, show the warning - if (event.isShiftClick()) { - String configMessage = toolStats.config.getString("messages.shift-click-warning.trading"); - if (configMessage != null) { - event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage)); - } - } - ItemStack newItem = addLore(item, player); - if (newItem != null) { - // this gets delayed since villager inventories suck for no reason - Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5); + if (!ItemChecker.isValidItem(item.getType())) { + return; + } + // if the player shift clicks, show the warning + if (event.isShiftClick()) { + String configMessage = toolStats.config.getString("messages.shift-click-warning.trading"); + if (configMessage != null) { + player.sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage)); } } + ItemStack newItem = addLore(item, player); + if (newItem != null) { + // set the new item + event.setCurrentItem(newItem); + } } } }