From b93d6b9cb13b8dc0ee7eb98287afbbc7709117da Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Wed, 30 Jul 2014 17:44:09 -0500 Subject: [PATCH] Fix "Click to Spectate" formatting --- .../src/mineplex/hub/server/ui/ServerNpcPage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java index 378578175..1ef2a5915 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java @@ -88,7 +88,7 @@ public class ServerNpcPage extends ShopPageBase im String openPremium = ChatColor.RESET + C.cRed + "Premium requires " + Rank.ULTRA.GetTag(false, false) + C.cRed + " or " + Rank.HERO.GetTag(false, false); String beta = ChatColor.RESET + C.Line + "Get Ultra to join Beta servers!"; String clickJoin = ChatColor.RESET + C.Line + "Click to Join"; - String inProgress = (serverInfo.Game == null || serverInfo.ServerType.equalsIgnoreCase("Competitive")) ? (ChatColor.RESET + C.Line + "Game in Progress.") : C.Line + "Click to Spectate"; + String inProgress = (serverInfo.Game == null || serverInfo.ServerType.equalsIgnoreCase("Competitive")) ? (ChatColor.RESET + C.Line + "Game in Progress.") : ChatColor.RESET + C.Line + "Click to Spectate"; String inProgressLine2 = (serverInfo.Game == null || serverInfo.ServerType.equalsIgnoreCase("Competitive")) ? null : (ChatColor.RESET + C.Line + "and wait for next game!"); if (isStarting(serverInfo) && (serverInfo.MaxPlayers - serverInfo.CurrentPlayers) >= slotsNeeded) @@ -117,7 +117,7 @@ public class ServerNpcPage extends ShopPageBase im } else { - if (serverInfo.CurrentPlayers >= serverInfo.MaxPlayers) + if (isInProgress(serverInfo) && serverInfo.CurrentPlayers >= serverInfo.MaxPlayers) { if (serverInfo.Game.equalsIgnoreCase("Survival Games")) {