diff --git a/Plugins/Mineplex.Core/.classpath b/Plugins/Mineplex.Core/.classpath
index 32e219c75..a189cbbe6 100644
--- a/Plugins/Mineplex.Core/.classpath
+++ b/Plugins/Mineplex.Core/.classpath
@@ -5,13 +5,13 @@
-
-
+
+
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index b9b0fc030..8192cea44 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -124,62 +124,57 @@ public class CoreClientManager extends MiniPlugin
public int getPlayerCountIncludingConnecting()
{
- return Bukkit.getOnlinePlayers().size() + Math.max(0, _clientsConnecting);
+ return Bukkit.getOnlinePlayers().size() + _clientsConnecting;
}
@EventHandler(priority = EventPriority.LOWEST)
public void AsyncLogin(AsyncPlayerPreLoginEvent event)
{
- try
+ _clientsConnecting++;
+ while (_clientsProcessing >= 5)
{
- _clientsConnecting++;
- while (_clientsProcessing >= 5)
- {
- try
- {
- Thread.sleep(25);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
- }
-
try
{
- _clientsProcessing++;
- LoadClient(Add(event.getName()), event.getUniqueId(), event.getAddress().getHostAddress());
+ Thread.sleep(25);
}
- catch(Exception exception)
+ catch (InterruptedException e)
{
- Logger.Instance.log(exception);
-
- event.disallow(Result.KICK_OTHER, "Error retrieving information from web, please retry in a minute.");
-
- System.out.println(exception.getMessage());
- }
- finally
- {
- _clientsProcessing--;
+ e.printStackTrace();
}
+ }
+
+ _clientsProcessing++;
+
+ try
+ {
+ LoadClient(Add(event.getName()), event.getUniqueId(), event.getAddress().getHostAddress());
+ }
+ catch(Exception exception)
+ {
+ Logger.Instance.log(exception);
+
+ event.disallow(Result.KICK_OTHER, "Error retrieving information from web, please retry in a minute.");
- if (Bukkit.hasWhitelist() && !Get(event.getName()).GetRank().Has(Rank.MODERATOR))
- {
- for (OfflinePlayer player : Bukkit.getWhitelistedPlayers())
- {
- if (player.getName().equalsIgnoreCase(event.getName()))
- {
- return;
- }
- }
-
- event.disallow(Result.KICK_WHITELIST, "You are not whitelisted my friend.");
- }
+ System.out.println(exception.getMessage());
}
finally
{
+ _clientsProcessing--;
_clientsConnecting--;
}
+
+ if (Bukkit.hasWhitelist() && !Get(event.getName()).GetRank().Has(Rank.MODERATOR))
+ {
+ for (OfflinePlayer player : Bukkit.getWhitelistedPlayers())
+ {
+ if (player.getName().equalsIgnoreCase(event.getName()))
+ {
+ return;
+ }
+ }
+
+ event.disallow(Result.KICK_WHITELIST, "You are not whitelisted my friend.");
+ }
}
public void loadClientByName(final String playerName, final Runnable runnable)
@@ -441,18 +436,6 @@ public class CoreClientManager extends MiniPlugin
}
}
- @EventHandler
- public void debug(UpdateEvent event)
- {
- if (event.getType() != UpdateType.SLOWER)
- return;
-
- System.out.println("=====");
- System.out.println("Connecting : " + _clientsConnecting);
- System.out.println("Processing : " + _clientsProcessing);
- System.out.println("=====");
- }
-
public void addStoredProcedureLoginProcessor(ILoginProcessor processor)
{
_loginProcessors.put(processor.getName(), processor);
diff --git a/Plugins/Mineplex.Database/.classpath b/Plugins/Mineplex.Database/.classpath
index d71aeaf95..7babbe493 100644
--- a/Plugins/Mineplex.Database/.classpath
+++ b/Plugins/Mineplex.Database/.classpath
@@ -2,8 +2,8 @@
-
+
diff --git a/Plugins/Mineplex.ServerData/.classpath b/Plugins/Mineplex.ServerData/.classpath
index 027819007..a4b0f68cd 100644
--- a/Plugins/Mineplex.ServerData/.classpath
+++ b/Plugins/Mineplex.ServerData/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
index 382daa5a2..26512abe6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
@@ -142,10 +142,11 @@ public class Christmas extends SoloGame
"Defeat the Thief who stole the Presents!"
});
- this.BlockBreakAllow.add(4);
- this.HungerSet = 20;
- this.WorldTimeSet = 2000;
- this.PrepareFreeze = false;
+ BlockBreakAllow.add(4);
+ HungerSet = 20;
+ WorldTimeSet = 2000;
+ PrepareFreeze = false;
+ Manager.GetServerConfig().RewardGems = false;
}
//parse 129 19 47 48 103 86 137 56 22 45 121 14 15 16 87 88 89 153 173 172 162