Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2014-12-23 04:15:55 -06:00
commit 21d255fcd1

View File

@ -555,12 +555,12 @@ public class ArcadeManager extends MiniPlugin implements IRelation
extrainformation += "|StaffHosted";
//Always Joinable
if (_game != null && _game.JoinInProgress)
{
event.setMotd(ChatColor.GREEN + "Recruiting" + extrainformation);
}
// if (_game != null && _game.JoinInProgress)
// {
// event.setMotd(ChatColor.GREEN + "Recruiting" + extrainformation);
// }
//UHC Timed
else if (_game != null && _game.GetType() == GameType.UHC)
if (_game != null && _game.GetType() == GameType.UHC)
{
event.setMotd(((UHC) _game).getMotdStatus() + extrainformation);
}