From 51456230cfa5253a27d436bce2c98b7e42e1c67a Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Fri, 21 May 2021 15:52:33 -0500
Subject: [PATCH] Don't take items in creative.

---
 .../ultimatestacker/listeners/BlockListeners.java     |  3 ++-
 .../ultimatestacker/listeners/SpawnerListeners.java   |  5 ++---
 .../com/songoda/ultimatestacker/utils/Methods.java    | 11 -----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
index a8ce55d..5214f2e 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
@@ -162,7 +162,8 @@ public class BlockListeners implements Listener {
 
                 stack.setAmount(stack.getAmount() + itemAmount);
                 plugin.updateHologram(stack);
-                hand.takeItem(player);
+                if (player.getGameMode() != GameMode.CREATIVE)
+                    hand.takeItem(player);
             }
         }
     }
diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
index 298b689..08db314 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
@@ -125,8 +125,7 @@ public class SpawnerListeners implements Listener {
         creatureSpawner.update();
 
         plugin.updateHologram(spawner);
-        if (player.getGameMode() != GameMode.CREATIVE) {
-            Methods.takeItem(player, stackSize);
-        }
+        if (player.getGameMode() != GameMode.CREATIVE)
+            CompatibleHand.getHand(event).takeItem(player, stackSize);
     }
 }
diff --git a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
index b499312..92a2eaa 100644
--- a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
+++ b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
@@ -130,17 +130,6 @@ public class Methods {
         return TextUtils.formatText(nameFormat).trim();
     }
 
-    public static void takeItem(Player player, int amount) {
-        if (player.getGameMode() == GameMode.CREATIVE) return;
-
-        ItemStack item = player.getInventory().getItemInHand();
-
-        int result = item.getAmount() - amount;
-        item.setAmount(result);
-
-        player.setItemInHand(result > 0 ? item : null);
-    }
-
     public static ItemStack getSpawnerItem(EntityType entityType, int amount) {
         ItemStack item = CompatibleMaterial.SPAWNER.getItem();
         ItemMeta meta = item.getItemMeta();