Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-02 03:01:53 -07:00
commit cb1a466a5b
1 changed files with 1 additions and 1 deletions

View File

@ -241,7 +241,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
AddButton(slot, shopItem, new JoinServerButton(this, serverInfo));
}
}
else
else if (isInProgress(serverInfo))
{
if (free)
yellowFreeCount++;