JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with the lobby menus

Browse Source
This commit is contained in:
Sam 2018-08-20 15:51:28 +01:00 committed by Alexander Meech
parent b62042718f
commit eeb632e58c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/lobby/LobbyMenu.java
View File

@ -42,7 +42,7 @@ public class LobbyMenu extends ShopPageBase<ServerManager, LobbyShop>
MinecraftServer serverStatus = server.getServer(); 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!"; String colour = C.cYellow, bottomLine = "Click to Join!";
boolean sameServer = serverName.equals(serverStatus.getName()); boolean sameServer = serverName.equals(serverStatus.getName());
boolean full = serverStatus.getPlayerCount() >= serverStatus.getMaxPlayerCount(); boolean full = serverStatus.getPlayerCount() >= serverStatus.getMaxPlayerCount();

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -135,7 +135,6 @@ import mineplex.minecraft.game.core.condition.Condition;
import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.minecraft.game.core.condition.ConditionManager;
import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.damage.DamageManager;
import mineplex.minecraft.game.core.fire.Fire; import mineplex.minecraft.game.core.fire.Fire;
import mineplex.serverdata.Region;
import nautilus.game.arcade.addons.SoupAddon; import nautilus.game.arcade.addons.SoupAddon;
import nautilus.game.arcade.booster.GameBoosterManager; import nautilus.game.arcade.booster.GameBoosterManager;
@ -1118,7 +1117,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
} }
// MPS // 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(); hostRank = _gameHostManager.getHostRank();
} }