From eeb632e58ced61e311db3dfd45f0a5fc71b195d1 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Aug 2018 15:51:28 +0100 Subject: [PATCH] Fix issues with the lobby menus --- .../src/mineplex/hub/server/ui/lobby/LobbyMenu.java | 2 +- .../src/nautilus/game/arcade/ArcadeManager.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/lobby/LobbyMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/lobby/LobbyMenu.java index 0708f29c9..17cc28147 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/lobby/LobbyMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/lobby/LobbyMenu.java @@ -42,7 +42,7 @@ public class LobbyMenu extends ShopPageBase MinecraftServer serverStatus = server.getServer(); - ItemBuilder builder = new ItemBuilder(Material.IRON_BLOCK); + ItemBuilder builder = new ItemBuilder(Material.IRON_BLOCK, Math.max(1, Math.min(server.getNumber(), 64))); String colour = C.cYellow, bottomLine = "Click to Join!"; boolean sameServer = serverName.equals(serverStatus.getName()); boolean full = serverStatus.getPlayerCount() >= serverStatus.getMaxPlayerCount(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index b41268001..38a97055c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -135,7 +135,6 @@ import mineplex.minecraft.game.core.condition.Condition; import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.fire.Fire; -import mineplex.serverdata.Region; import nautilus.game.arcade.addons.SoupAddon; import nautilus.game.arcade.booster.GameBoosterManager; @@ -1118,7 +1117,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation } // MPS - if (_gameHostManager.isPrivateServer() && _gameHostManager.getHostRank().hasPermission(Perm.FEATURED_SERVER)) + if (_gameHostManager.isPrivateServer() && _gameHostManager.getHostRank() != null && _gameHostManager.getHostRank().hasPermission(Perm.FEATURED_SERVER)) { hostRank = _gameHostManager.getHostRank(); }