fixed shulker lag issue with ender chests

zeroBzeroT · May 7, 2024 · 191b1b2 · 191b1b2
1 parent 5ef1227
commit 191b1b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.zeroBzeroT</groupId>
     <artifactId>AntiIllegals</artifactId>
-    <version>1.0.56</version>
+    <version>1.0.57</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/src/main/java/org/zeroBzeroT/antiillegals/Events.java b/src/main/java/org/zeroBzeroT/antiillegals/Events.java
@@ -175,7 +175,7 @@ public void onInventoryOpen(@NotNull final InventoryOpenEvent event) {
         final Location location = player.getLocation();
 
         if (inventory.getType() == InventoryType.ENDER_CHEST) {
-            BookHelper.cleanBookShulkers(inventory, location);
+            BookHelper.checkEnderChest(event, location);
             return;
         }
         RevertHelper.checkInventory(inventory, location, true);

diff --git a/src/main/java/org/zeroBzeroT/antiillegals/helpers/BookHelper.java b/src/main/java/org/zeroBzeroT/antiillegals/helpers/BookHelper.java
@@ -3,6 +3,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -107,5 +108,18 @@ public static int cleanOversizedItems(@NotNull final Inventory inventory, @Nulla
         }
         return counter;
     }
+    public static void checkEnderChest(@NotNull final InventoryOpenEvent inventoryOpenEvent,
+                                       @Nullable final Location location) {
+        final Inventory inventory = inventoryOpenEvent.getInventory();
+        final ItemStack[] inventoryContents = inventory.getContents();
+
+        for (final ItemStack itemStack : inventoryContents) {
+            if (itemStack == null) continue;
+
+            InventoryHolderHelper.iterateInventory(itemStack, inv ->
+                    BookHelper.cleanBookItems(inv, location, BookHelper.filterBooks(inv).toList())
+            );
+        }
+    }
 
 }