ignore gui item interactions in illegal listeners

xGinko · Jan 1, 2025 · 382aa5b · 382aa5b
1 parent 132d99d
commit 382aa5b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 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
@@ -54,7 +54,10 @@ public abstract class IllegalItemModule extends AEFModule implements Listener {
 
     protected final AEFPermission bypassPermission;
     protected final IllegalHandling handling;
+
     protected final Set<Listener> optionalListeners;
+    protected final boolean guiPluginsSupported;
+
     private final Cache<Class<? extends Event>, ExpiringSet<Object>> listenerCooldowns;
     private final Function<Class<? extends Event>, @PolyNull ExpiringSet<Object>> createIfAbsent;
 
@@ -80,7 +83,7 @@ public IllegalItemModule(String configPath, boolean defEnabled, AEFPermission by
         }
         this.handling = handling;
 
-        final boolean guiPluginsSupported = config.getBoolean(configPath + ".gui-plugins-supported", false, """
+        this.guiPluginsSupported = config.getBoolean(configPath + ".gui-plugins-supported", false, """
                 Enable this if you have problems with the plugin removing items from chest guis.""");
         if (this.handling == IllegalHandling.STRICT) {
             optionalListeners.add(new Listener() {
@@ -237,6 +240,8 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent event) {
+        if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
+
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
             event.setCancelled(true);
             return;
@@ -261,6 +266,8 @@ public void onInventoryClick(InventoryClickEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryInteract(InventoryInteractEvent event) {
+        if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
+
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
             event.setCancelled(true);
             return;

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
@@ -54,7 +54,10 @@ public abstract class IllegalItemModule extends AEFModule implements Listener {
 
     protected final AEFPermission bypassPermission;
     protected final IllegalHandling handling;
+
     protected final Set<Listener> optionalListeners;
+    protected final boolean guiPluginsSupported;
+
     private final Cache<Class<? extends Event>, ExpiringSet<Object>> listenerCooldowns;
     private final Function<Class<? extends Event>, @PolyNull ExpiringSet<Object>> createIfAbsent;
 
@@ -80,7 +83,7 @@ public IllegalItemModule(String configPath, boolean defEnabled, AEFPermission by
         }
         this.handling = handling;
 
-        final boolean guiPluginsSupported = config.getBoolean(configPath + ".gui-plugins-supported", false,
+        this.guiPluginsSupported = config.getBoolean(configPath + ".gui-plugins-supported", false,
                 "Enable this if you have problems with the plugin removing items from chest guis.");
         if (this.handling == IllegalHandling.STRICT) {
             optionalListeners.add(new Listener() {
@@ -236,6 +239,8 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent event) {
+        if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
+
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
             event.setCancelled(true);
             return;
@@ -260,6 +265,8 @@ public void onInventoryClick(InventoryClickEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryInteract(InventoryInteractEvent event) {
+        if (guiPluginsSupported && event.getInventory().getLocation() == null) return;
+
         if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
             event.setCancelled(true);
             return;