From a395cae7645e516ab0022e56eb5ea4f61eb62de5 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sat, 13 Sep 2014 20:50:27 -1000
Subject: [PATCH] Fixes for Custom tag Fix for Bridge time Fix for tournament
 auto whitelist. Added UI stuf for tourney

Added build files for arcade.
---
 Plugins/BuildFiles/common.xml                              | 3 +++
 Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java  | 7 +++++--
 .../src/mineplex/hub/server/ServerManager.java             | 3 +++
 .../src/nautilus/game/arcade/ArcadeManager.java            | 5 -----
 .../src/nautilus/game/arcade/game/games/bridge/Bridge.java | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml
index 9fc19c40a..7db11c0aa 100644
--- a/Plugins/BuildFiles/common.xml
+++ b/Plugins/BuildFiles/common.xml
@@ -17,6 +17,9 @@
 			<fileset dir="../Mineplex.Minecraft.Game.Core/bin">
 				<include name="**/*.class"/>
 			</fileset>
+			<fileset dir="../Mineplex.Database/bin">
+				<include name="**/*.class"/>
+			</fileset>
 			<fileset dir="../Nautilus.Game.Arcade">
 				<include name="*.yml"/>
 			</fileset>
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
index 9a70c0ad7..fea6cefba 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
@@ -78,17 +78,20 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler
 				PacketPlayOutSpawnEntityLiving spawnPacket = (PacketPlayOutSpawnEntityLiving)packet;
 
 				// Ignore Armor stand packets
-				if (spawnPacket.b == 30)
+				if (spawnPacket.b == 30 || spawnPacket.l == null || spawnPacket.l.c() == null || spawnPacket.a == 777777)
 				{
 					return;
 				}
 				
-				for (WatchableObject watchable : (List<WatchableObject>)spawnPacket.l.b())
+				for (WatchableObject watchable : (List<WatchableObject>)spawnPacket.l.c())
 				{
 					if ((watchable.a() == 11 || watchable.a() == 3) && watchable.b() instanceof Byte)
 					{
 						final String entityName = spawnPacket.l.getString(10);
 						
+						if (entityName.isEmpty())
+							return;
+						
 						if (_entityMap.get(owner).containsKey(spawnPacket.a))
 						{
 							verifier.bypassProcess(new PacketPlayOutEntityDestroy(_entityMap.get(owner).get(spawnPacket.a)));
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index 7cb9dd79a..c22c7b276 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -499,6 +499,9 @@ public class ServerManager extends MiniPlugin
 					if (_clientManager.Get(partyPlayer).GetRank().Has(Rank.ULTRA) || _donationManager.Get(partyPlayer.getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA"))
 						continue;
 					
+					if (serverInfo.Name.contains("T_"))
+						continue;
+					
 					partyPlayer.leaveVehicle();
 					partyPlayer.eject();
 					
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index cbfeca093..f1489a529 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -147,11 +147,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		super("Game Manager", plugin);
 
 		_serverConfig = serverConfig;
-		if (serverConfig.Tournament)
-		{
-			AntiHack.Instance.SetEnabled(false);
-			Bukkit.getServer().setWhitelist(true);
-		}
 
 		// Modules
 		_antistack = antistack;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
index d32fb6221..4cb129dbd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
@@ -79,7 +79,7 @@ public class Bridge extends TeamGame implements OreObsfucation
 	private static final Material[] PLAYER_DROP_DELAY_MATERIALS = new Material[] { Material.LOG, Material.LOG_2, Material.IRON_ORE, Material.DIAMOND_ORE, Material.COAL_ORE, Material.GOLD_ORE, Material.WORKBENCH, Material.FURNACE };
 
 	//Bridge Timer
-	private int _bridgeTime = 5000; //600000
+	private int _bridgeTime = 600000;
 	private boolean _bridgesDown = false;
 
 	//Wood Bridge