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

Minor verbage "Starting in 1 Second."

Browse Source 
Fixed NPE in client cleanup.
This commit is contained in:
Jonathan Williams 2014-01-03 05:50:05 -05:00
parent faea1072a1
commit 6904f9cf3d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
View File

@ -237,14 +237,15 @@ public class CoreClientManager implements Listener
{
Player clientPlayer = clientIterator.next().getValue().GetPlayer();
if ((clientPlayer == null || !clientPlayer.isOnline()) && !_dontRemoveList.contains(clientPlayer.getName()))
if (clientPlayer == null || (!clientPlayer.isOnline() && !_dontRemoveList.contains(clientPlayer.getName())))
{
synchronized(_clientLock)
{
clientIterator.remove();
}
_plugin.getServer().getPluginManager().callEvent(new ClientUnloadEvent(clientPlayer.getName()));
if (clientPlayer != null)
_plugin.getServer().getPluginManager().callEvent(new ClientUnloadEvent(clientPlayer.getName()));
}
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -890,7 +890,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener
if (Manager.GetGame() != null && Manager.GetGame().GetCountdown() >= 0)
{
if (Manager.GetGame().GetCountdown() > 0)
objective.setDisplayName(C.Bold + "§lStarting in " + C.cGreen + "§l" + Manager.GetGame().GetCountdown() + " Seconds");
objective.setDisplayName(C.Bold + "§lStarting in " + C.cGreen + "§l" + Manager.GetGame().GetCountdown() + (Manager.GetGame().GetCountdown() == 1 ? " Second" : " Seconds"));
else if (Manager.GetGame().GetCountdown() == 0)
objective.setDisplayName(ChatColor.WHITE + "§lIn Progress...");
}