Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java

Plugins/Mineplex.Core/.classpath

@@ -5,13 +5,13 @@
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpcore-4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.ServerData"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jedis-2.4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-pool2-2.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-dbcp2-2.0.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.4.2.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java

@@ -124,13 +124,11 @@ 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)
@@ -145,9 +143,10 @@ public class CoreClientManager extends MiniPlugin
 			}
 		}
 		
+		_clientsProcessing++;
+		
 		try
 		{	
-				_clientsProcessing++;
 			LoadClient(Add(event.getName()), event.getUniqueId(), event.getAddress().getHostAddress());
 		}
 		catch(Exception exception)
@@ -161,6 +160,7 @@ public class CoreClientManager extends MiniPlugin
 		finally
 		{
 			_clientsProcessing--;
+			_clientsConnecting--;
 		}
 		
 		if (Bukkit.hasWhitelist() && !Get(event.getName()).GetRank().Has(Rank.MODERATOR))
@@ -176,11 +176,6 @@ public class CoreClientManager extends MiniPlugin
 			event.disallow(Result.KICK_WHITELIST, "You are not whitelisted my friend.");
 		}
 	}
-		finally
-		{
-			_clientsConnecting--;
-		}
-	}
 	
 	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);

Plugins/Mineplex.Database/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-meta-3.4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-codegen-3.4.2.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jooq-3.4.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Plugins/Mineplex.ServerData/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/jedis-2.4.2.jar"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-pool2-2.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/gson-2.2.1.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-pool2-2.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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);
+		BlockBreakAllow.add(4);
-		this.HungerSet = 20;
+		HungerSet = 20;
-		this.WorldTimeSet = 2000;
+		WorldTimeSet = 2000;
-		this.PrepareFreeze = false;
+		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