From 8bca23f0baad8b1d79d897a0cb90a0cb17524bcc Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Thu, 25 Sep 2014 23:27:08 -0700 Subject: [PATCH] Fixed bug with custom tag fix :P Fixed bug with server group up time check in servermonitor. --- .../Mineplex.Core/src/mineplex/core/CustomTagFix.java | 9 +++++---- Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- .../src/mineplex/serverdata/ServerGroup.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index c93bfc30b..a1cf0ed03 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -60,6 +60,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler public void playerQuit(PlayerQuitEvent event) { _entityMap.remove(event.getPlayer()); + _loggedIn.remove(event.getPlayer()); } @EventHandler @@ -68,14 +69,14 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler if (event.getType() != UpdateType.SEC) return; - for (Iterator iterator = _entityMap.keySet().iterator(); iterator.hasNext();) + for (Iterator iterator = _loggedIn.keySet().iterator(); iterator.hasNext();) { Player player = iterator.next(); - if (!_loggedIn.containsKey(player) || (System.currentTimeMillis() - _loggedIn.get(player) > 5000 && !player.isOnline())) + if (System.currentTimeMillis() - _loggedIn.get(player) > 5000 && !player.isOnline()) { iterator.remove(); - _loggedIn.remove(player); + _entityMap.remove(player); System.out.println("Found broken player in CustomTagFix.... '" + player.getName() + "'"); } } @@ -91,7 +92,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler Player owner = packetInfo.getPlayer(); PacketVerifier verifier = packetInfo.getVerifier(); - if (UtilPlayer.is1_8(owner)) + if (owner.isOnline() && UtilPlayer.is1_8(owner)) { if (owner.isOnline() && !_entityMap.containsKey(owner)) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index ba865f4ed..38281e54c 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -70,7 +70,7 @@ public class Hub extends JavaPlugin implements IRelation Logger.initialize(this); //Static Modules - CommandCenter.Initialize(this); + CommandCenter.Initialize(this); CoreClientManager clientManager = new CoreClientManager(this, webServerAddress); CommandCenter.Instance.setClientManager(clientManager); diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerGroup.java index d57d16bbc..dfebd6849 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerGroup.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerGroup.java @@ -234,7 +234,7 @@ public class ServerGroup for (MinecraftServer server : _servers) { - if (server.isEmpty() && server.getUptime() <= 150) // Only return empty servers that have been online for >150 seconds + if (server.isEmpty() && server.getUptime() >= 150) // Only return empty servers that have been online for >150 seconds { emptyServers.add(server); }