2.1.1-SNAPSHOT fix

SakiPowered · Jun 28, 2024 · b0558d9 · b0558d9
1 parent 4747d6b
commit b0558d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/adventure/build.gradle b/adventure/build.gradle
@@ -1,5 +1,5 @@
 archivesBaseName = 'zaiko-adventure'
-version = '2.1.0' // < change this version
+version = '2.1.1-SNAPSHOT' // < change this version
 description = 'Adventure support for Zaiko titles'
 
 dependencies {

diff --git a/api/build.gradle b/api/build.gradle
@@ -1,3 +1,3 @@
 archivesBaseName = 'zaiko'
-version = '2.1.0' // < change this version
+version = '2.1.1-SNAPSHOT' // < change this version
 description = 'A modern and flexible GUI library for Spigot'
diff --git a/api/src/main/java/gg/saki/zaiko/MenuListener.java b/api/src/main/java/gg/saki/zaiko/MenuListener.java
@@ -33,9 +33,6 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * The main listener for handling interactions with {@link Menu}s.
  */
@@ -58,36 +55,22 @@ private void onClick(InventoryClickEvent event) {
 
         if (menu == null) return;
 
+        Inventory inventory = event.getInventory();
+
         Inventory clickedInventory = event.getClickedInventory();
 
         if (clickedInventory == null) {
             return;
         }
 
-        if (menu.settings().playerInventoryInteraction()
-                && clickedInventory.getType() == InventoryType.PLAYER) return;
-
-        Placeable placeable = menu.getPlaceable(event.getSlot());
+        Placeable placeable = menu.getPlaceable(event.getRawSlot());
 
         if (placeable != null) {
             placeable.click(event);
             return;
         }
 
-
-        if (!menu.settings().transferItems()) {
-            if (event.getAction() == InventoryAction.MOVE_TO_OTHER_INVENTORY && clickedInventory.getType() == InventoryType.PLAYER) {
-                event.setCancelled(true);
-                event.setCursor(null);
-                return;
-            }
-
-            if (clickedInventory.getType() != InventoryType.PLAYER) {
-                event.setCancelled(true);
-                player.getInventory().addItem(event.getCursor());
-                event.setCursor(null);
-            }
-        }
+        event.setCancelled(true);
     }
 
 
@@ -101,17 +84,6 @@ private void onDrag(InventoryDragEvent event) {
 
         if (menu == null) return;
 
-        Inventory inventory = event.getInventory();
-
-
-        List<Integer> slots = new ArrayList<>(event.getInventorySlots());
-        if (!menu.settings().transferItems() && inventory.getType() != InventoryType.PLAYER && inventory.getItem(slots.get(0)) == null) {
-            event.setCancelled(true);
-            player.getInventory().addItem(event.getOldCursor());
-            event.setCursor(null);
-            return;
-        }
-
         ItemStack cursor = event.getOldCursor();
 
         for (Placeable placeable : menu.getPlaceableArray()) {