Catch GUIMenu errors and close the menu if they occur

CitizensDev · Dec 27, 2022 · 79d7dd6 · 79d7dd6
1 parent d1bc232
commit 79d7dd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/gui/InventoryMenu.java b/src/main/java/net/citizensnpcs/api/gui/InventoryMenu.java
@@ -324,7 +324,12 @@ public void onInventoryClick(InventoryClickEvent event) {
         if (page == null || transitioning || closingViews)
             return;
         delayViewerChanges = true;
-        handleClick(event);
+        try {
+            handleClick(event);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            event.getWhoClicked().closeInventory();
+        }
         delayViewerChanges = false;
     }
 

diff --git a/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java b/src/main/java/net/citizensnpcs/api/util/MemoryDataKey.java
@@ -7,7 +7,6 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 
 public class MemoryDataKey extends DataKey {
@@ -101,12 +100,7 @@ public Iterable<DataKey> getSubKeys() {
         if (head == null)
             return Collections.emptyList();
         Set<String> keys = head.getKeys(false);
-        return Iterables.transform(keys, new Function<String, DataKey>() {
-            @Override
-            public DataKey apply(String input) {
-                return new MemoryDataKey(root, getKeyFor(input));
-            }
-        });
+        return Iterables.transform(keys, input -> new MemoryDataKey(root, getKeyFor(input)));
     }
 
     @Override

diff --git a/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java b/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java
@@ -210,6 +210,8 @@ public static class InferenceTest {
     }
 
     public static class ListTest {
+        @Persist
+        private List<Map> mapTest;
         @Persist
         private List<String> test;
     }