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

This commit is contained in:
Jonathan Williams 2014-11-07 02:35:48 -08:00
commit 5c6f12db20
2 changed files with 7 additions and 7 deletions

View File

@ -508,11 +508,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
public void MessageMOTD(ServerListPingEvent event)
{
//Mineplex Private Servers
if (_gameHostManager.isHostExpired())
{
event.setMotd(ChatColor.RED + "Finished");
return;
}
// if (_gameHostManager.isHostExpired())
// {
// event.setMotd(ChatColor.RED + "Finished");
// return;
// }
String extrainformation = "|" + _serverConfig.ServerType + "|" + (_game == null ? "Unknown" : _game.GetName())
+ "|" + ((_game == null || _game.WorldData == null) ? "Unknown" : _game.WorldData.MapName);

View File

@ -44,7 +44,7 @@ public class GameHostManager implements Listener
Manager.GetPluginManager().registerEvents(this, Manager.GetPlugin());
}
/*
@EventHandler
public void updateHost(UpdateEvent event)
{
@ -251,5 +251,5 @@ public class GameHostManager implements Listener
Manager.GetGame().Announce(C.cGreen + C.Bold + _host.getName() + " has stopped the game.");
}
*/
}