diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 89fa1e5ca..d08242d0f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -75,6 +75,7 @@ public class ServerManager extends MiniPlugin private boolean _alternateUpdateFire = false; private boolean _retrieving = false; + private long _lastRetrieve = 0; public ServerManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, Portal portal, PartyManager partyManager, ServerStatusManager statusManager, HubManager hubManager, StackerManager stackerManager) { @@ -280,7 +281,7 @@ public class ServerManager extends MiniPlugin @EventHandler public void updateServers(UpdateEvent event) { - if (event.getType() != UpdateType.SEC || _retrieving) + if (event.getType() != UpdateType.SEC || (_retrieving && System.currentTimeMillis() - _lastRetrieve <= 5000)) return; _alternateUpdateFire = !_alternateUpdateFire; @@ -290,6 +291,7 @@ public class ServerManager extends MiniPlugin _retrieving = true; + _statusManager.retrieveServerStatuses(new Callback>() { public void run(List serverStatusList) @@ -343,6 +345,7 @@ public class ServerManager extends MiniPlugin // Reset _retrieving = false; + _lastRetrieve = System.currentTimeMillis(); } }); } diff --git a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml index 337183661..05ceb4e3b 100644 --- a/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml +++ b/Website/LOC.Website.Web/LOC.Website.Web.Publish.xml @@ -1,12 +1,12 @@  + - @@ -19,15 +19,16 @@ - + + - + @@ -41,15 +42,18 @@ - + + + + @@ -58,8 +62,7 @@ - - + @@ -70,23 +73,23 @@ - + + - + - - - + + @@ -94,7 +97,7 @@ - + @@ -102,42 +105,43 @@ - - + - - - + + + - + + - + + - + @@ -148,315 +152,49 @@ - + - - - - + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + - - + @@ -465,8 +203,8 @@ - - + + @@ -474,19 +212,19 @@ - + - - + + - - - + + - - + + + @@ -501,29 +239,291 @@ - + - + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 79c3ce56d..25df00210 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ