Fixed NPE when using the main menu button on sellhead

Errored-Innovations · Apr 17, 2020 · 0d63292 · 0d63292
1 parent b6e71e5
commit 0d63292
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/InventoryManager.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/InventoryManager.java
@@ -47,6 +47,7 @@ public static void initiateInvsAndIcons() {
         inventories.put(InventoryType.CHALLENGES_MENU, ChallengesMenu.class);
         inventories.put(InventoryType.CHALLENGES_LIST, ChallengesSection.class);
         inventories.put(InventoryType.CHALLENGES_PINNED, ChallengesPinnedInv.class);
+        inventories.put(InventoryType.SELLHEAD_CATEGORY, SellheadCategory.class);
 
         // Allow icons to have their own character
         cachedIcons.put('C', Content.class);
@@ -94,6 +95,10 @@ public boolean isGlitchSlotFilled() {
 
     public void open(InventoryType type, HashMap<String, String> context) {
         // Check if a new inventory is being opened and reset the page
+        if (type == null) {
+            Bukkit.getPlayer(player).closeInventory();
+            return;
+        }
         if (type != this.type) {
             currentPage = 1;
             section = null;

diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/list/Menu.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/list/Menu.java
@@ -28,7 +28,7 @@ public boolean onClick(Player player, InventoryClickEvent event) {
                 break;
             case SELLHEAD_MENU:
             case SELLHEAD_CATEGORY:
-                type = InventoryManager.InventoryType.SELLHEAD_MENU;
+                type = null;
                 break;
             case CHALLENGES_PINNED:
             case CHALLENGES_LIST: