Fixed warp inventory bug

noahhusby · Feb 22, 2022 · d1e7e40 · d1e7e40
1 parent f338bed
commit d1e7e40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bukkit/src/main/java/com/noahhusby/sledgehammer/server/gui/warp/menu/GroupWarpInventory.java b/bukkit/src/main/java/com/noahhusby/sledgehammer/server/gui/warp/menu/GroupWarpInventory.java
@@ -201,13 +201,13 @@ public GroupWarpInventoryController(GUIController controller, WarpPayload payloa
 
         @Override
         public void init() {
-            WarpGroupPayload group = payload.getGroups().get(groupId);
-            if (group == null) {
+            if (groupId == null || !payload.getGroups().containsKey(groupId)) {
                 close();
                 GUIRegistry.register(new AllWarpInventory.AllWarpInventoryController(getPlayer(), payload));
                 return;
             }
 
+            WarpGroupPayload group = payload.getGroups().get(groupId);
             List<Warp> warps = Lists.newArrayList();
             for (Integer warpId : group.getWarps()) {
                 Warp warp = payload.getWaypoints().get(warpId);

diff --git a/bungeecord/src/main/java/com/noahhusby/sledgehammer/proxy/warp/WarpHandler.java b/bungeecord/src/main/java/com/noahhusby/sledgehammer/proxy/warp/WarpHandler.java
@@ -296,6 +296,9 @@ public WarpPayload generateGUIPayload(SledgehammerPlayer player, boolean editAcc
             } else {
                 localGroup = warpGroup.getId();
             }
+            if (page == Page.LOCAL_GROUP && localGroup != null && !warpGroups.containsKey(localGroup)) {
+                page = Page.ALL;
+            }
         }
 
         Map<String, WarpGroupPayload> groups = Maps.newHashMap();