Fix "Click to Spectate" formatting

This commit is contained in:
Shaun Bennett 2014-07-30 17:44:09 -05:00
parent 3e9aebdb87
commit b93d6b9cb1

View File

@ -88,7 +88,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> 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<ServerManager, ServerNpcShop> im
}
else
{
if (serverInfo.CurrentPlayers >= serverInfo.MaxPlayers)
if (isInProgress(serverInfo) && serverInfo.CurrentPlayers >= serverInfo.MaxPlayers)
{
if (serverInfo.Game.equalsIgnoreCase("Survival Games"))
{