Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars

Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerTracker/PlayerTracker.java

@@ -38,9 +38,8 @@ public class PlayerTracker implements Listener, Runnable
 		_plugin.getProxy().getPluginManager().registerListener(_plugin, this);
 		_plugin.getProxy().getScheduler().schedule(_plugin, this, 1L, 1L, TimeUnit.MINUTES);
 		
-		Region region = !new File("eu.dat").exists() ? Region.US : Region.EU;
 		_repository = new RedisDataRepository<PlayerStatus>(ServerManager.getMasterConnection(), ServerManager.getSlaveConnection(),
-				region, PlayerStatus.class, "playerStatus");
+				Region.currentRegion(), PlayerStatus.class, "playerStatus");
 		
 		ServerCommandManager.getInstance().registerCommandType("PlayerJoinCommand", mineplex.serverdata.commands.PlayerJoinCommand.class, new PlayerJoinHandler(this));
 		

Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java

@@ -28,13 +28,6 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 	@Override
 	public void Execute(final Player caller, String[] args)
 	{		
-		if (!Plugin.Get(caller).GetRank(true).has(caller, Rank.ADMIN, true))
-		{
-			return;
-		}
-		
-		boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
-
 		if (args == null)
 		{			
 			UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR"));
@@ -62,14 +55,6 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 			
 			final Rank rank = tempRank;
 			 
-			if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR || rank == Rank.SUPPORT)
-			{
-				if (!testServer && rank.has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT))
-				{
-					UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!"));
-					return;
-				}
-				
 			Plugin.getRepository().matchPlayerName(new Callback<List<String>>()
 			{
 				public void run(List<String> matches)
@@ -136,5 +121,4 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 			}, playerName);
 		}
 	}
-	}
 }

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java

@@ -74,6 +74,8 @@ public abstract class Gadget extends SalesPackageBase implements Listener
 			return;
 		}
 		
+		System.out.println(player.getName() + " has activated " + Name);
+		
 		EnableCustom(player);
 		Manager.setActive(player, this);
 	}

Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java

@@ -269,6 +269,13 @@ public class ProjectileUser
 						nmsEntity.locY -= nmsEntity.motY / f2 * 0.0500000007450581D;
 						nmsEntity.locZ -= nmsEntity.motZ / f2 * 0.0500000007450581D;
 						
+						if (nmsEntity.locX == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locX NaN.");
+						if (nmsEntity.locY == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locY NaN.");
+						if (nmsEntity.locZ == Double.NaN)
+							System.out.println(_thrown + " has made " + nmsEntity + "'s locZ NaN.");
+						
 						_callback.Collide(null, block, this);
 						return true;
 					}

Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java

@@ -149,7 +149,7 @@ public class Hub extends JavaPlugin implements IRelation
 				return true;
 			}
 		});
-		new GlobalPacketManager(this, clientManager, serverStatusManager);
+		new GlobalPacketManager(this, clientManager, serverStatusManager, inventoryManager, donationManager, petManager, statsManager, giveawayManager);
 		//new Replay(this, packetHandler);
 
 		AprilFoolsManager.Initialize(this, clientManager, disguiseManager);

Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java

@@ -224,6 +224,8 @@ public class StackerManager extends MiniPlugin implements IThrown
 		UtilPlayer.message(thrower, F.main("Stacker", "You threw " + F.name(UtilEnt.getName(throwee))));
 		UtilPlayer.message(throwee, F.main("Stacker", "You were thrown by " + F.name(thrower.getName())));
 
+		System.out.println("Stacker throw.");
+		
 		UtilAction.velocity(throwee, thrower.getLocation().getDirection(), 1.8, false, 0, 0.3, 2, false);
 
 		_projectileManager.AddThrow(throwee, thrower, this, 4000, true, false, true, false, 0.5f);
@@ -245,6 +247,8 @@ public class StackerManager extends MiniPlugin implements IThrown
 		if (!Manager.hasPlayerStackingEnabled(target))
 			return;
 		
+		System.out.println("Stacker collide.");
+		
 		//Velocity
 		UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown(), target), 1, true, 0.8, 0, 10, true);