From 02cf238cd2eca6417ccc88078c3b2004e9913888 Mon Sep 17 00:00:00 2001
From: JaTiTV <info.jatitv@gmail.com>
Date: Wed, 29 Dec 2021 06:34:29 +0100
Subject: [PATCH] Fix UseItem.InventorySlot.SlotEnforce

---
 .../commandguiv2/Spigot/Listener/ItemChange.java      | 11 +++++++++--
 .../commandguiv2/Spigot/cmdManagement/Commands.java   |  8 ++++++--
 .../commandguiv2/Spigot/system/Give_UseItem.java      |  8 ++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java
index ecae016..55b463c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java	
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java	
@@ -14,11 +14,16 @@ import org.bukkit.scheduler.BukkitRunnable;
 public class ItemChange {
     public static void itemChange(Player player) {
         Integer slot;
-        if (Select_Database.selectSlot(player) == null) {
+        if (SelectConfig.UseItem_InventorySlotEnforce){
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            slot = Select_Database.selectSlot(player);
+            if (Select_Database.selectSlot(player) == null) {
+                slot = SelectConfig.UseItem_InventorySlot;
+            } else {
+                slot = Select_Database.selectSlot(player);
+            }
         }
+
         if (!SelectConfig.UseItem_Enable) {
             return;
         }
@@ -55,7 +60,9 @@ public class ItemChange {
                         }
                     }
                     if (!SelectConfig.UseItem_AllowToggle || Select_Database.selectItemStatus(player)) {
+                        send.debugmsg(Main.plugin, "1");
                         if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) {
+                            send.debugmsg(Main.plugin, "2");
                             Give_UseItem.onGive(player);
                             if (SelectConfig.Cursor_ToGUIItem_OnLogin) {
                                 if (SelectConfig.Cursor_ToGUIItem_OnlyOnFirstLogin) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java
index 0c90f14..7717a0b 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java	
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java	
@@ -128,10 +128,14 @@ public class Commands {
             }
         }
         Integer slot = null;
-        if (Select_Database.selectSlot(player) == null) {
+        if (SelectConfig.UseItem_InventorySlotEnforce){
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            slot = Select_Database.selectSlot(player);
+            if (Select_Database.selectSlot(player) == null) {
+                slot = SelectConfig.UseItem_InventorySlot;
+            } else {
+                slot = Select_Database.selectSlot(player);
+            }
         }
         send.debug(plugin,String.valueOf(slot));
         if (player.getInventory().getItem(slot - 1) == null) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java
index aba390a..52d42db 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java	
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java	
@@ -26,10 +26,14 @@ public class Give_UseItem {
 
     public static void onGive(Player player) {
         Integer slot;
-        if (Select_Database.selectSlot(player) == null) {
+        if (SelectConfig.UseItem_InventorySlotEnforce){
             slot = SelectConfig.UseItem_InventorySlot;
         } else {
-            slot = Select_Database.selectSlot(player);
+            if (Select_Database.selectSlot(player) == null) {
+                slot = SelectConfig.UseItem_InventorySlot;
+            } else {
+                slot = Select_Database.selectSlot(player);
+            }
         }
         if (SelectConfig.UseItem_InventorySlot_FreeSlot) {
             player.getInventory().addItem(itemStack(player));