diff --git a/src/main/java/com/alttd/GUI/windows/BuyGUI.java b/src/main/java/com/alttd/GUI/windows/BuyGUI.java index 8fbba5d..dfb4ea9 100644 --- a/src/main/java/com/alttd/GUI/windows/BuyGUI.java +++ b/src/main/java/com/alttd/GUI/windows/BuyGUI.java @@ -4,6 +4,7 @@ import com.alttd.GUI.GUIMerchant; import com.alttd.VillagerUI; import com.alttd.config.Config; import com.alttd.config.WorthConfig; +import com.alttd.events.SpawnShopEvent; import com.alttd.objects.EconUser; import com.alttd.objects.Price; import com.alttd.objects.VillagerType; @@ -12,11 +13,11 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.Template; import net.milkbowl.vault.economy.Economy; import org.apache.commons.lang.StringUtils; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.util.StringUtil; import java.util.Objects; @@ -64,10 +65,9 @@ public class BuyGUI extends GUIMerchant { .toLowerCase().replaceAll("_", " "))), Template.of("price", String.valueOf(cost)))); -// Bukkit.getServer().getPluginManager() -// .callEvent(new SpawnShopEvent(player, amount, cost, material, -// oldPoints, econUser.getPointsMap().get(villagerType.getName()), true)); - //TODO FIX LOGGING + Bukkit.getServer().getPluginManager() + .callEvent(new SpawnShopEvent(player, amount, cost, material, + oldPoints, econUser.getPointsMap().get(villagerType.getName()), true)); } private ItemStack getPriceItem(double price) { diff --git a/src/main/java/com/alttd/GUI/windows/SellGUI.java b/src/main/java/com/alttd/GUI/windows/SellGUI.java index e85db4f..e6a1dee 100644 --- a/src/main/java/com/alttd/GUI/windows/SellGUI.java +++ b/src/main/java/com/alttd/GUI/windows/SellGUI.java @@ -4,6 +4,7 @@ import com.alttd.GUI.GUIMerchant; import com.alttd.VillagerUI; import com.alttd.config.Config; import com.alttd.config.WorthConfig; +import com.alttd.events.SpawnShopEvent; import com.alttd.objects.EconUser; import com.alttd.objects.Price; import com.alttd.objects.VillagerType; @@ -12,8 +13,10 @@ import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.Template; import net.milkbowl.vault.economy.Economy; import org.apache.commons.lang.StringUtils; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.ItemMeta; @@ -85,10 +88,9 @@ public class SellGUI extends GUIMerchant { .toLowerCase().replaceAll("_", " "))), Template.of("price", String.valueOf(cost)))); -// Bukkit.getServer().getPluginManager() -// .callEvent(new SpawnShopEvent(player, amount, cost, material, -// oldPoints, econUser.getPointsMap().get(villagerType.getName()), false)); - //TODO FIX LOGGING + Bukkit.getServer().getPluginManager() + .callEvent(new SpawnShopEvent(player, amount, cost, material, + oldPoints, econUser.getPointsMap().get(villagerType.getName()), false)); } private ItemStack getPriceItem(double price) { diff --git a/src/main/java/com/alttd/events/SpawnShopEvent.java b/src/main/java/com/alttd/events/SpawnShopEvent.java index c1139ea..8f09903 100644 --- a/src/main/java/com/alttd/events/SpawnShopEvent.java +++ b/src/main/java/com/alttd/events/SpawnShopEvent.java @@ -14,6 +14,7 @@ public final class SpawnShopEvent extends Event { private final int pointsBefore; private final int pointsAfter; private final boolean buy; + private final HandlerList handlers = new HandlerList(); public SpawnShopEvent(Player player, int amount, double price, Material item, int pointsBefore, int pointsAfter, boolean buy) { @@ -56,7 +57,7 @@ public final class SpawnShopEvent extends Event { @Override public @NotNull HandlerList getHandlers() { - return null; + return handlers; } }