Fix lore messages not displaying correctly under certain circumstances

This commit is contained in:
Shaun Bennett 2014-07-31 17:30:02 -05:00
parent 41128cbc9d
commit cf724272dd

View File

@ -146,7 +146,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
}
else
{
if (isInProgress(serverInfo) && serverInfo.CurrentPlayers >= serverInfo.MaxPlayers)
if (isInProgress(serverInfo))
{
if (serverInfo.MOTD.contains("Restarting"))
{
@ -184,7 +184,16 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
else
{
if (free || ownsUltraPackage)
lore.add(MESSAGE_JOIN);
{
if (serverInfo.CurrentPlayers >= serverInfo.MaxPlayers && !ownsUltraPackage)
{
lore.add(MESSAGE_FULL_GET_ULTRA);
}
else
{
lore.add(MESSAGE_JOIN);
}
}
else
{
lore.add(MESSAGE_REQUIRES_PREMIUM);