From f0c9edfdacdb7469f3c703415caedce2384c1feb Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Thu, 23 Dec 2021 16:40:56 +0100
Subject: [PATCH] moved removing items from inventory

---
 .../java/com/alttd/GUI/windows/SellGUI.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alttd/GUI/windows/SellGUI.java b/src/main/java/com/alttd/GUI/windows/SellGUI.java
index e6a1dee..fd50dad 100644
--- a/src/main/java/com/alttd/GUI/windows/SellGUI.java
+++ b/src/main/java/com/alttd/GUI/windows/SellGUI.java
@@ -63,9 +63,25 @@ public class SellGUI extends GUIMerchant {
 
         econ.depositPlayer(player, cost);
         econUser.addPoints(villagerType.getName(), -price.getPoints());
+
+        removeItems(inventory, material, amount);
+
+        player.sendMessage(MiniMessage.get().parse(Config.SOLD_ITEM,
+                Template.of("amount", String.valueOf(amount)),
+                Template.of("item", StringUtils.capitalize(material.name()
+                        .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));
+    }
+
+    private void removeItems(Inventory inventory, Material material, int amount) {
         var ref = new Object() {
             int tmpAmount = amount;
         };
+
         Arrays.stream(inventory.getContents())
                 .filter(Objects::nonNull)
                 .filter(itemStack -> itemStack.getType().equals(material))
@@ -81,16 +97,6 @@ public class SellGUI extends GUIMerchant {
                         itemStack.setAmount(0);
                     }
                 });
-        //TODO remove items from inv
-        player.sendMessage(MiniMessage.get().parse(Config.SOLD_ITEM,
-                Template.of("amount", String.valueOf(amount)),
-                Template.of("item", StringUtils.capitalize(material.name()
-                        .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));
     }
 
     private ItemStack getPriceItem(double price) {