From 4336b454b7a2edca0901fb570eb0e5bd5dade006 Mon Sep 17 00:00:00 2001
From: Jikoo <jikoo.games@gmail.com>
Date: Thu, 24 Jun 2021 08:21:26 -0400
Subject: [PATCH] Fix potential CME closing viewers without access

Closes #33
---
 .../internal/v1_17_R1/AnySilentContainer.java |  4 --
 .../main/java/com/lishid/openinv/OpenInv.java | 40 +++++++++----------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
index 3f7085e..4e8091d 100644
--- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
+++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java
@@ -336,10 +336,6 @@ public class AnySilentContainer implements IAnySilentContainer {
         try {
             this.playerInteractManagerGamemode.setAccessible(true);
             this.playerInteractManagerGamemode.set(player.d, gameMode);
-            // TODO: may need additional calls to update abilities to prevent container sound + animation
-            //  gameMode.a(player.getAbilities());
-            //  player.updateAbilities();
-            //  should be the fix if it doesn't work as-is
         } catch (IllegalArgumentException | IllegalAccessException e) {
             e.printStackTrace();
         }
diff --git a/plugin/src/main/java/com/lishid/openinv/OpenInv.java b/plugin/src/main/java/com/lishid/openinv/OpenInv.java
index 3d34472..680683d 100644
--- a/plugin/src/main/java/com/lishid/openinv/OpenInv.java
+++ b/plugin/src/main/java/com/lishid/openinv/OpenInv.java
@@ -35,10 +35,12 @@ import com.lishid.openinv.util.ConfigUpdater;
 import com.lishid.openinv.util.InternalAccessor;
 import com.lishid.openinv.util.LanguageManager;
 import com.lishid.openinv.util.Permissions;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
@@ -88,7 +90,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                 // Check if inventory is stored, and if it is, remove it and eject all viewers
                 if (OpenInv.this.inventories.containsKey(key)) {
                     Inventory inv = OpenInv.this.inventories.remove(key).getBukkitInventory();
-                    List<HumanEntity> viewers = inv.getViewers();
+                    List<HumanEntity> viewers = new ArrayList<>(inv.getViewers());
                     for (HumanEntity entity : viewers.toArray(new HumanEntity[0])) {
                         entity.closeInventory();
                     }
@@ -97,7 +99,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
                 // Check if ender chest is stored, and if it is, remove it and eject all viewers
                 if (OpenInv.this.enderChests.containsKey(key)) {
                     Inventory inv = OpenInv.this.enderChests.remove(key).getBukkitInventory();
-                    List<HumanEntity> viewers = inv.getViewers();
+                    List<HumanEntity> viewers = new ArrayList<>(inv.getViewers());
                     for (HumanEntity entity : viewers.toArray(new HumanEntity[0])) {
                         entity.closeInventory();
                     }
@@ -126,29 +128,23 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         }
 
         if (this.inventories.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.inventories.get(key).getBukkitInventory().getViewers().iterator();
-            //noinspection WhileLoopReplaceableByForEach
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                // If player has permission or is in the same world, allow continued access
-                // Just in case, also allow null worlds.
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
-            }
+            kickCrossWorldViewers(player, this.inventories.get(key));
         }
 
         if (this.enderChests.containsKey(key)) {
-            Iterator<HumanEntity> iterator = this.enderChests.get(key).getBukkitInventory().getViewers().iterator();
-            //noinspection WhileLoopReplaceableByForEach
-            while (iterator.hasNext()) {
-                HumanEntity human = iterator.next();
-                if (Permissions.CROSSWORLD.hasPermission(human) || human.getWorld().equals(player.getWorld())) {
-                    continue;
-                }
-                human.closeInventory();
+            kickCrossWorldViewers(player, this.enderChests.get(key));
+        }
+    }
+
+    private void kickCrossWorldViewers(Player player, ISpecialInventory inventory) {
+        List<HumanEntity> viewers = new ArrayList<>(inventory.getBukkitInventory().getViewers());
+        for (HumanEntity human : viewers) {
+            // If player has permission or is in the same world, allow continued access
+            // Just in case, also allow null worlds.
+            if (Permissions.CROSSWORLD.hasPermission(human) || Objects.equals(human.getWorld(), player.getWorld())) {
+                continue;
             }
+            human.closeInventory();
         }
     }
 
@@ -326,7 +322,7 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
         return this.languageManager.getValue(key, getLocale(sender), replacements);
     }
 
-    private @Nullable String getLocale(@NotNull CommandSender sender) {
+    private @NotNull String getLocale(@NotNull CommandSender sender) {
         if (sender instanceof Player) {
             return ((Player) sender).getLocale();
         } else {