ignore drops in inventory clicks

xGinko · Jan 2, 2025 · e8be936 · e8be936
1 parent 76c2fa0
commit e8be936
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/...ploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java b/...ploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java
@@ -248,16 +248,11 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
     public void onInventoryClick(InventoryClickEvent event) {
+        if (event.isCancelled() && illegalHandling == IllegalHandling.PREVENT_USE_ONLY) return;
         if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
-
-        if (illegalHandling == IllegalHandling.PREVENT_USE_ONLY) {
-            if (    event.isCancelled()
-                    || event.getClick() == ClickType.DROP
-                    || event.getClick() == ClickType.CONTROL_DROP
-                    || event.getClick() == ClickType.WINDOW_BORDER_LEFT
-                    || event.getClick() == ClickType.WINDOW_BORDER_RIGHT) {
-                return;
-            }
+        if (event.getClick() == ClickType.DROP || event.getClick() == ClickType.CONTROL_DROP
+                || event.getClick() == ClickType.WINDOW_BORDER_LEFT || event.getClick() == ClickType.WINDOW_BORDER_RIGHT) {
+            return;
         }
 
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {

diff --git a/...loitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java b/...loitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java
@@ -247,16 +247,11 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
     public void onInventoryClick(InventoryClickEvent event) {
+        if (event.isCancelled() && illegalHandling == IllegalHandling.PREVENT_USE_ONLY) return;
         if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
-
-        if (illegalHandling == IllegalHandling.PREVENT_USE_ONLY) {
-            if (    event.isCancelled()
-                    || event.getClick() == ClickType.DROP
-                    || event.getClick() == ClickType.CONTROL_DROP
-                    || event.getClick() == ClickType.WINDOW_BORDER_LEFT
-                    || event.getClick() == ClickType.WINDOW_BORDER_RIGHT) {
-                return;
-            }
+        if (event.getClick() == ClickType.DROP || event.getClick() == ClickType.CONTROL_DROP
+                || event.getClick() == ClickType.WINDOW_BORDER_LEFT || event.getClick() == ClickType.WINDOW_BORDER_RIGHT) {
+            return;
         }
 
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {