JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Shaun Bennett 2014-12-23 06:20:43 -06:00
commit d40b154902
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/KillButton.java
View File

@ -27,13 +27,7 @@ public class KillButton implements IButton
{
if (clickType == clickType.SHIFT_RIGHT)
{
for (Player other : UtilServer.getPlayers())
{
UtilPlayer.message(player, C.cGold + C.Bold + "The host has closed this Mineplex Private Server.");
other.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
_arcade.GetPortal().SendPlayerToServer(other, "Lobby");
}
_manager.setHostExpired(true);
_manager.setHostExpired(true, "The host has closed this Mineplex Private Server.");
}
}
}

37
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
View File

@ -158,16 +158,47 @@ public class GameHostManager implements Listener
}
}
@EventHandler
public void updateHostExpired(UpdateEvent event)
{
if (!isPrivateServer())
return;
if (event.getType() != UpdateType.FAST)
return;
if (Manager.GetGame() != null && Manager.GetGame().GetState() != GameState.Recruit)
return;
if (_hostExpired)
return;
if (UtilTime.elapsed(_lastOnline, _expireTime))
setHostExpired(true, Manager.GetServerConfig().HostName + " has abandoned the server. Thanks for playing!");
else if (UtilTime.elapsed(_serverStartTime, _serverExpireTime))
setHostExpired(true, "This server has expired! Thank you for playing!");
}
public boolean isHostExpired()
{
if (Manager.GetHost() == null || Manager.GetHost().length() == 0)
if (!isPrivateServer())
return false;
return _hostExpired || UtilTime.elapsed(_lastOnline, _expireTime) || UtilTime.elapsed(_serverStartTime, _serverExpireTime);
return _hostExpired;
}
public void setHostExpired(boolean expired)
public void setHostExpired(boolean expired, String string)
{
for (Player other : UtilServer.getPlayers())
{
UtilPlayer.message(other, C.cGold + C.Bold + string);
other.playSound(other.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
Manager.GetPortal().SendPlayerToServer(other, "Lobby");
}
_hostExpired = expired;
}