From 6008e58c12318fe26e389781d20d60fa465ea79c Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Wed, 8 Jul 2015 09:49:41 +0100
Subject: [PATCH 001/113] Added map selection to MPS.

---
 .../privateServer/button/ChooseMapButton.java | 41 ++++++++++++++++++
 .../gui/privateServer/page/ChooseMapPage.java | 43 +++++++++++++++++++
 .../gui/privateServer/page/SetGamePage.java   | 21 +++++++--
 3 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
new file mode 100644
index 000000000..1dbc380a9
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
@@ -0,0 +1,41 @@
+package nautilus.game.arcade.gui.privateServer.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 08/07/2015
+ */
+public class ChooseMapButton implements IButton
+{
+	private ArcadeManager _arcadeManager;
+	private PrivateServerShop _privateServerShop;
+	private GameType _gameType;
+	private String _map;
+
+	public ChooseMapButton(ArcadeManager arcadeManager, PrivateServerShop privateServerShop, GameType gameType, String map)
+	{
+		_arcadeManager = arcadeManager;
+		_privateServerShop = privateServerShop;
+		_gameType = gameType;
+		_map = map;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_arcadeManager.GetGameCreationManager().MapPref = _map;
+		_arcadeManager.GetGame().setGame(_gameType, player, true);
+		player.closeInventory();
+		return;
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
new file mode 100644
index 000000000..d1c062387
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
@@ -0,0 +1,43 @@
+package nautilus.game.arcade.gui.privateServer.page;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import mineplex.core.shop.item.ShopItem;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.button.ChooseMapButton;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 08/07/2015
+ */
+public class ChooseMapPage extends BasePage
+{
+	private GameType _gameType;
+
+	public ChooseMapPage(ArcadeManager plugin, PrivateServerShop shop, Player player, GameType gameType)
+	{
+		super(plugin, shop, "Choose Map", player);
+		_gameType = gameType;
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		addBackButton(4);
+
+		int slot = 0;
+		for (String cur : getPlugin().LoadFiles(_gameType.GetName())){
+			ChooseMapButton btn = new ChooseMapButton(getPlugin(), getShop(), _gameType, cur);
+			addButton(slot, new ShopItem(Material.MAP, "cur", new String[]{"§7Click to select map."}, 1, false), btn);
+			slot++;
+		}
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index b8ca9a28e..5f41f6a13 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -62,15 +62,28 @@ public class SetGamePage extends BasePage
 
 	private void addGameButton(int slot, final GameType type)
 	{
-		String infoString = ChatColor.RESET + C.cGray + "Click to make this next Game Type";
-		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{infoString}, 1, false, false);
+		String infoString = ChatColor.RESET + C.cGray + "Make this next Game Type";
+		String space = "";
+		String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §drandom map§7.";
+		String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §6choose map§7.";
+		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{infoString, space, left, right}, 1, false, false);
 		addButton(slot, shopItem, new IButton()
 		{
 			@Override
 			public void onClick(Player player, ClickType clickType)
 			{
-				getPlugin().GetGame().setGame(type, player, true);
-				player.closeInventory();
+				if (clickType == ClickType.LEFT)
+				{
+					getPlugin().GetGame().setGame(type, player, true);
+					player.closeInventory();
+					return;
+				}
+				else if (clickType == ClickType.RIGHT)
+				{
+					getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, type));
+					return;
+				}
+
 			}
 		});
 	}

From 3ba7ba259cc620a5f7968492bd72e13f44bf5cef Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Wed, 8 Jul 2015 15:24:16 +0100
Subject: [PATCH 002/113] Added map selection to MPS.

---
 Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml          | 2 ++
 Plugins/.idea/codeStyleSettings.xml                           | 1 +
 .../game/arcade/gui/privateServer/page/ChooseMapPage.java     | 4 ++--
 .../game/arcade/gui/privateServer/page/SetGamePage.java       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
index 3f5cae6e4..2fb39df09 100644
--- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
+++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
@@ -18,6 +18,8 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
       <element id="module-output" name="Mineplex.Database" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/org-apache-commons-lang.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index 8e890f86b..44295e3d8 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -37,6 +37,7 @@
         </codeStyleSettings>
       </value>
     </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
index d1c062387..3e48034b7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
@@ -33,10 +33,10 @@ public class ChooseMapPage extends BasePage
 	{
 		addBackButton(4);
 
-		int slot = 0;
+		int slot = 9;
 		for (String cur : getPlugin().LoadFiles(_gameType.GetName())){
 			ChooseMapButton btn = new ChooseMapButton(getPlugin(), getShop(), _gameType, cur);
-			addButton(slot, new ShopItem(Material.MAP, "cur", new String[]{"§7Click to select map."}, 1, false), btn);
+			addButton(slot, new ShopItem(Material.MAP, cur.split(" ")[1], new String[]{"§7Click to select map."}, 1, false), btn);
 			slot++;
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 5f41f6a13..8e651c664 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -63,7 +63,7 @@ public class SetGamePage extends BasePage
 	private void addGameButton(int slot, final GameType type)
 	{
 		String infoString = ChatColor.RESET + C.cGray + "Make this next Game Type";
-		String space = "";
+		String space = "§1";
 		String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §drandom map§7.";
 		String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §6choose map§7.";
 		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{infoString, space, left, right}, 1, false, false);

From 152523fc3dfd2b0f700adb2d3f05883400baa4b9 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 10 Jul 2015 13:13:38 +0200
Subject: [PATCH 003/113] snowfight update

---
 .../game/games/snowfight/SnowFight.java       | 333 +++++++++++-------
 1 file changed, 206 insertions(+), 127 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index 5343d64f2..f3ad91423 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -1,5 +1,23 @@
 package nautilus.game.arcade.game.games.snowfight;
 
+import java.util.HashMap;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.snowfight.kits.KitTactician;
+import nautilus.game.arcade.game.games.snowfight.kits.KitMedic;
+import nautilus.game.arcade.game.games.snowfight.kits.KitSportsman;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.SmashKit;
+
 import org.bukkit.Effect;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -7,52 +25,53 @@ import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Egg;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Snowball;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
-
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEvent;
-import mineplex.core.common.util.UtilGear;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilWorld;
-import mineplex.core.common.util.UtilEvent.ActionType;
-import mineplex.core.itemstack.ItemStackFactory;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.game.TeamGame;
-import nautilus.game.arcade.kit.Kit;
-import nautilus.game.arcade.kit.NullKit;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.potion.PotionType;
 
 public class SnowFight extends TeamGame
 {
-	public SnowFight(ArcadeManager manager) 
+
+	private HashMap<Player, Integer> _tiles;
+
+	public SnowFight(ArcadeManager manager)
 	{
 		super(manager, GameType.SnowFight,
 
-				new Kit[]
-						{
-				new NullKit(manager)
-						},
+		new Kit[]
+		{
+				new KitSportsman(manager), 
+				new KitTactician(manager),
+				new KitMedic(manager)
+		},
+
+		new String[]
+		{
+			"Just like... kill your enemies. with snow."
+		});
 
-				new String[]
-						{
-				"Just like... kill your enemies. with snow."
-						});
-		
 		this.HungerSet = 20;
+		this.CompassEnabled = true;
+		this.CompassGiveItem = false;
+		this.TeamArmor = true;
+		this.TeamArmorHotbar = true;
+		this._tiles = new HashMap<Player, Integer>();
 	}
 
-
 	@EventHandler
 	public void Weather(UpdateEvent event)
 	{
@@ -70,6 +89,29 @@ public class SnowFight extends TeamGame
 		world.setTime(4000);
 	}
 
+	@EventHandler
+	public void KitItems(UpdateEvent event)
+	{
+		if(!IsLive())
+			return;
+		
+		if (event.getType() == UpdateType.SLOWER)
+		{
+			for (Player player : GetPlayers(true))
+			{
+				if (GetKit(player) instanceof KitTactician)
+				{
+					int amount = 0;
+					if (player.getInventory().getItem(1) != null && player.getInventory().getItem(1).getAmount() <= 2)
+						amount = 2;
+					else 
+						amount = 1;
+					player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.EGG, (byte) 0, amount,  "Slow Egg"));
+				}
+			}
+		}
+	}
+
 	@EventHandler
 	public void BlockDamage(BlockDamageEvent event)
 	{
@@ -84,97 +126,119 @@ public class SnowFight extends TeamGame
 		if (!IsSnow(event.getBlock()))
 			return;
 
-		
-		if (UtilInv.contains(player, Material.SNOW_BALL, (byte)0, 16))
+		if (UtilInv.contains(player, Material.SNOW_BALL, (byte) 0, 16))
 			return;
 
-		//Item
-		UtilInv.insert(player, new ItemStack(Material.SNOW_BALL));
+		// Item
 
-		//Snow Height
+		if (!_tiles.containsKey(player))
+		{
+			_tiles.put(player, 0);
+		}
+
+		if (GetKit(player) instanceof KitSportsman)
+			UtilInv.insert(player, new ItemStack(Material.SNOW_BALL));
+
+
+		int tiles = _tiles.get(player);
+		_tiles.put(player, tiles + 1);
+
+		if (!(GetKit(player) instanceof KitSportsman))
+		{
+			if (_tiles.get(player) == 2)
+			{
+				UtilInv.insert(player, new ItemStack(Material.SNOW_BALL));
+				_tiles.put(player, 0);
+			}
+		}
+
+		// Snow Height
 		SnowDecrease(event.getBlock(), 1);
 
-		//Effect
-		event.getBlock().getWorld().playEffect(event.getBlock().getLocation(), Effect.STEP_SOUND, 80);	
+		// Effect
+		event.getBlock().getWorld().playEffect(event.getBlock().getLocation(), Effect.STEP_SOUND, 80);
 	}
 
-//	@EventHandler
-//	public void InteractSnowball(PlayerInteractEvent event)
-//	{
-//		Player player = event.getPlayer();
-//
-//		if (!IsLive())
-//			return;
-//
-//		if (!IsPlaying(player))
-//			return;
-//
-//		if (!UtilGear.isMat(player.getItemInHand(), Material.SNOW_BALL))
-//			return;
-//
-//		event.setCancelled(true);
-//
-//		if (UtilEvent.isAction(event, ActionType.L))
-//			SnowballThrow(player);
-//
-//		else if (UtilEvent.isAction(event, ActionType.R_BLOCK))
-//			SnowballPlace(player, event.getClickedBlock(), 1);
-//	}
-//
-//	private void SnowballPlace(Player player, Block block, int above) 
-//	{
-//		if (block.getTypeId() == 78 || UtilBlock.airFoliage(block))
-//		{
-//			//Build
-//			if (block.getTypeId() == 78)
-//			{
-//				block.setTypeIdAndData(78, (byte)(block.getData() + 1), true);
-//
-//				if (block.getData() >= 7)
-//					block.setTypeIdAndData(80, (byte)0, true);
-//			}
-//			else
-//			{
-//				block.setTypeIdAndData(78, (byte)0, true);
-//			}
-//
-//			//Sound
-//			block.getWorld().playSound(block.getLocation(), Sound.STEP_SNOW, 1f, 0.6f);
-//
-//			//Use Snow
-//			SnowballCount(player, -1);
-//		}
-//		else if ((IsSnow(block) || UtilBlock.solid(block)) && above > 0)
-//		{
-//			SnowballPlace(player, block.getRelative(BlockFace.UP), above - 1);
-//		}
-//	}
-//
-//	private void SnowballThrow(Player player) 
-//	{
-//		//Throw
-//		player.launchProjectile(Snowball.class);
-//
-//		//Use Snow
-//		SnowballCount(player, -1);
-//
-//		//Sound
-//		player.getWorld().playSound(player.getLocation(), Sound.STEP_SNOW, 3f, 1.5f);
-//	}
+	// @EventHandler
+	// public void InteractSnowball(PlayerInteractEvent event)
+	// {
+	// Player player = event.getPlayer();
+	//
+	// if (!IsLive())
+	// return;
+	//
+	// if (!IsPlaying(player))
+	// return;
+	//
+	// if (!UtilGear.isMat(player.getItemInHand(), Material.SNOW_BALL))
+	// return;
+	//
+	// event.setCancelled(true);
+	//
+	// if (UtilEvent.isAction(event, ActionType.L))
+	// SnowballThrow(player);
+	//
+	// else if (UtilEvent.isAction(event, ActionType.R_BLOCK))
+	// SnowballPlace(player, event.getClickedBlock(), 1);
+	// }
+	//
+	// private void SnowballPlace(Player player, Block block, int above)
+	// {
+	// if (block.getTypeId() == 78 || UtilBlock.airFoliage(block))
+	// {
+	// //Build
+	// if (block.getTypeId() == 78)
+	// {
+	// block.setTypeIdAndData(78, (byte)(block.getData() + 1), true);
+	//
+	// if (block.getData() >= 7)
+	// block.setTypeIdAndData(80, (byte)0, true);
+	// }
+	// else
+	// {
+	// block.setTypeIdAndData(78, (byte)0, true);
+	// }
+	//
+	// //Sound
+	// block.getWorld().playSound(block.getLocation(), Sound.STEP_SNOW, 1f,
+	// 0.6f);
+	//
+	// //Use Snow
+	// SnowballCount(player, -1);
+	// }
+	// else if ((IsSnow(block) || UtilBlock.solid(block)) && above > 0)
+	// {
+	// SnowballPlace(player, block.getRelative(BlockFace.UP), above - 1);
+	// }
+	// }
+	//
+	// private void SnowballThrow(Player player)
+	// {
+	// //Throw
+	// player.launchProjectile(Snowball.class);
+	//
+	// //Use Snow
+	// SnowballCount(player, -1);
+	//
+	// //Sound
+	// player.getWorld().playSound(player.getLocation(), Sound.STEP_SNOW, 3f,
+	// 1.5f);
+	// }
 
-//	private void SnowballCount(Player player, int count)
-//	{
-//		if (player.getInventory().getItem(1) != null)
-//			count += player.getInventory().getItem(1).getAmount();
-//
-//		if (count > 16)			
-//			count = 16;
-//
-//		if (count > 0)
-//			player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.SNOW_BALL, count));
-//		else
-//			player.getInventory().setItem(1, null);
-//	}
+	// private void SnowballCount(Player player, int count)
+	// {
+	// if (player.getInventory().getItem(1) != null)
+	// count += player.getInventory().getItem(1).getAmount();
+	//
+	// if (count > 16)
+	// count = 16;
+	//
+	// if (count > 0)
+	// player.getInventory().setItem(1,
+	// ItemStackFactory.Instance.CreateStack(Material.SNOW_BALL, count));
+	// else
+	// player.getInventory().setItem(1, null);
+	// }
 
 	private void SnowDecrease(Block block, int height)
 	{
@@ -184,30 +248,39 @@ public class SnowFight extends TeamGame
 		if (!IsSnow(block))
 			return;
 
-		//Shuffle Up
+		// Shuffle Up
 		while (IsSnow(block.getRelative(BlockFace.UP)))
 			block = block.getRelative(BlockFace.UP);
 
-		//Snow Block
-		int snowLevel = 8;	
-		if (block.getTypeId() == 78)	
+		// Snow Block
+		int snowLevel = 8;
+		if (block.getTypeId() == 78)
 			snowLevel = block.getData() + 1;
 
-		//Lower
+		// Lower
 		if (height >= snowLevel)
 		{
-			block.setTypeIdAndData(0, (byte)0, true);
-			SnowDecrease(block.getRelative(BlockFace.DOWN), height-snowLevel);
+			block.setTypeIdAndData(0, (byte) 0, true);
+			SnowDecrease(block.getRelative(BlockFace.DOWN), height - snowLevel);
 		}
 		else
 		{
-			block.setTypeIdAndData(78, (byte)(snowLevel-height-1), true);
+			block.setTypeIdAndData(78, (byte) (snowLevel - height - 1), true);
+		}
+	}
+	
+	@EventHandler
+	public void HealthRegen(EntityRegainHealthEvent event) 
+	{
+		if(event.getRegainReason() == RegainReason.SATIATED)
+		{
+			event.setAmount(1);
 		}
 	}
 
 	@EventHandler(priority = EventPriority.HIGH)
-	public void SnowballDamage(CustomDamageEvent event)
-	{		
+	public void SnowballEggDamage(CustomDamageEvent event)
+	{
 		if (event.IsCancelled())
 			return;
 
@@ -215,16 +288,22 @@ public class SnowFight extends TeamGame
 			return;
 
 		Projectile proj = event.GetProjectile();
-		if (proj == null)		return;
-
-		if (!(proj instanceof Snowball))
+		if (proj == null)
 			return;
-
-		event.AddMod("Snowball", "Snowball", 3, true);
+		
+		if(proj instanceof Egg) 
+		{
+			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 100, 1));
+			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 40, 0));
+		}
+			
+		event.AddMod("Snowball", "Snowball", 2, true);
 		event.SetIgnoreRate(true);
+		event.SetIgnoreArmor(true);
 
-		//Effect
-		proj.getWorld().playEffect(proj.getLocation(), Effect.STEP_SOUND, 80);	
+		// Effect
+		proj.getWorld().playEffect(proj.getLocation(), Effect.STEP_SOUND, 80);
+		((Player) proj.getShooter()).playSound(((Player) proj.getShooter()).getLocation(), Sound.SUCCESSFUL_HIT, 1, 1);
 	}
 
 	private boolean IsSnow(Block block)

From 5429e3eb7688bb36813abdbce84b470f65683ce0 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 10 Jul 2015 13:17:07 +0200
Subject: [PATCH 004/113] snowfight kits

---
 .../game/games/snowfight/kits/KitMedic.java   | 63 +++++++++++++++++++
 .../games/snowfight/kits/KitSportsman.java    | 59 +++++++++++++++++
 .../games/snowfight/kits/KitTactician.java    | 52 +++++++++++++++
 3 files changed, 174 insertions(+)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
new file mode 100644
index 000000000..e0921999c
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
@@ -0,0 +1,63 @@
+package nautilus.game.arcade.game.games.snowfight.kits;
+
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Color;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionType;
+
+public class KitMedic extends Kit
+{
+
+	public KitMedic(ArcadeManager manager)
+	{
+		super(manager, "Medic", KitAvailability.Free, 
+
+				new String[] 
+						{
+				"You get 1 Snowball every 2 tiles you break!",
+				"Recieve 5 health potions!",
+				"You get a Soup!"
+						}, 
+
+						new Perk[] 
+								{
+								}, 
+								EntityType.SKELETON,
+								new ItemStack(Material.POTION));
+	
+
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		Potion potion = new Potion(PotionType.INSTANT_HEAL);
+		potion.setLevel(2);
+		potion.setSplash(true);
+		for(int i = 3; i <= 7; i++) {
+			player.getInventory().setItem(i, potion.toItemStack(1));
+		}
+	}
+	
+	@Override
+	public void SpawnCustom(LivingEntity ent) 
+	{
+		ent.getEquipment().setHelmet(new ItemStack(Material.LEATHER_HELMET));
+		ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));
+		ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));
+		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
new file mode 100644
index 000000000..96d8c7628
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
@@ -0,0 +1,59 @@
+package nautilus.game.arcade.game.games.snowfight.kits;
+
+import org.bukkit.Color;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+public class KitSportsman extends Kit
+{
+	
+	public KitSportsman(ArcadeManager manager)
+	{
+		super(manager, "Sportsman", KitAvailability.Free, 
+
+				new String[] 
+						{
+				"You get 1 Snowball per tile you break!",
+				"Recieve a compass!",
+				"You get Soups and Speed!"
+						}, 
+
+						new Perk[] 
+								{
+								}, 
+								EntityType.SKELETON,
+								new ItemStack(Material.SNOW_BALL));
+
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.COMPASS.getId(), (byte) 0, 1, "§a§lTracking Compass"));
+		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0));
+	}
+
+	@Override
+	public void SpawnCustom(LivingEntity ent) 
+	{
+		ent.getEquipment().setHelmet(new ItemStack(Material.LEATHER_HELMET));
+		ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));
+		ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));
+		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
+	}
+	
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
new file mode 100644
index 000000000..97db5e7cd
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
@@ -0,0 +1,52 @@
+package nautilus.game.arcade.game.games.snowfight.kits;
+
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Color;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+
+public class KitTactician extends Kit
+{
+
+	public KitTactician(ArcadeManager manager)
+	{
+		super(manager, "Tactician", KitAvailability.Free, 
+					new String[] 
+						{
+						"You get 1 Snowball every 2 tiles you break!",
+						"get 1 Slow Egg every 16 Seconds! (max. 2)",
+						"You get Soups!"
+								}, new Perk[] 
+								{
+								}, 
+								EntityType.SKELETON,
+								new ItemStack(Material.EGG));
+
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+	}
+	
+	@Override
+	public void SpawnCustom(LivingEntity ent) 
+	{
+		ent.getEquipment().setHelmet(new ItemStack(Material.LEATHER_HELMET));
+		ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));
+		ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));
+		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
+	}
+
+}

From 64915a0b7d2fca7dcf499f97bb32d228aa5c6b73 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sat, 11 Jul 2015 04:28:37 +0200
Subject: [PATCH 005/113] Implementing Meteoroids for Game end and changing Kit
 description.

---
 .../game/games/snowfight/SnowFight.java       | 279 +++++++++++++++++-
 .../game/games/snowfight/kits/KitMedic.java   |  11 +-
 .../games/snowfight/kits/KitSportsman.java    |  10 +-
 .../games/snowfight/kits/KitTactician.java    |  14 +-
 4 files changed, 303 insertions(+), 11 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index f3ad91423..bf7e83c1c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -1,31 +1,55 @@
 package nautilus.game.arcade.game.games.snowfight;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilSound;
+import mineplex.core.common.util.UtilText;
+import mineplex.core.common.util.UtilTextMiddle;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilWorld;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.explosion.ExplosionEvent;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import mineplex.minecraft.game.core.explosion.CustomExplosion;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.games.snowfight.kits.KitTactician;
 import nautilus.game.arcade.game.games.snowfight.kits.KitMedic;
 import nautilus.game.arcade.game.games.snowfight.kits.KitSportsman;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.SmashKit;
+import net.minecraft.server.v1_7_R4.EntityFireball;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Effect;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftFireball;
 import org.bukkit.entity.Egg;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Snowball;
@@ -33,20 +57,26 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
 
 public class SnowFight extends TeamGame
 {
 
 	private HashMap<Player, Integer> _tiles;
+	private boolean _meteoroids;
 
 	public SnowFight(ArcadeManager manager)
 	{
@@ -61,7 +91,8 @@ public class SnowFight extends TeamGame
 
 		new String[]
 		{
-			"Just like... kill your enemies. with snow."
+			"Just like... kill your enemies. with snow.",
+			"Be careful if you are on Ice your body will freeze"
 		});
 
 		this.HungerSet = 20;
@@ -70,6 +101,7 @@ public class SnowFight extends TeamGame
 		this.TeamArmor = true;
 		this.TeamArmorHotbar = true;
 		this._tiles = new HashMap<Player, Integer>();
+		this._meteoroids = false;
 	}
 
 	@EventHandler
@@ -111,6 +143,48 @@ public class SnowFight extends TeamGame
 			}
 		}
 	}
+	
+	@EventHandler
+	public void IceDamage(UpdateEvent event) {
+		if(event.getType() != UpdateType.SEC)
+			return;
+		
+		if(!IsLive())
+			return;
+		
+		for(Player player : GetPlayers(true)) 
+		{
+			if(IsOnIce(player))
+			{
+				Bukkit.getPluginManager().callEvent(new CustomDamageEvent(player, null, null, DamageCause.CUSTOM, 4.0D, false, true, true, "Ice", "Ice", false));
+			}
+		}
+		
+	}
+	
+	@EventHandler
+	public void Meteor(UpdateEvent event) {
+		if(event.getType() != UpdateType.TWOSEC)
+			return;
+		
+		if(!IsLive()) 
+			return;
+		
+		if(System.currentTimeMillis() <= getGameLiveTime() + (4 * 60 * 1000))
+			return;
+		
+		if(!_meteoroids)
+		{
+			for(Player player : GetPlayers(false))
+			{
+				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1F, 1F);
+				UtilTextMiddle.display(C.cGold + C.Bold + "ICE METEOROIDS!!!", "Avoid the Ice Fields", player);
+			}
+			this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "METEOROIDS START FALLING!");
+			_meteoroids = true;
+		}
+		makeMeteor();
+	}
 
 	@EventHandler
 	public void BlockDamage(BlockDamageEvent event)
@@ -277,6 +351,13 @@ public class SnowFight extends TeamGame
 			event.setAmount(1);
 		}
 	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void GenerallDamage(CustomDamageEvent event)
+	{
+		if(event.GetCause() == DamageCause.ENTITY_ATTACK)
+			event.AddMod(event.GetDamagerPlayer(false).getName(), "Melee", 1, true);
+	}
 
 	@EventHandler(priority = EventPriority.HIGH)
 	public void SnowballEggDamage(CustomDamageEvent event)
@@ -291,13 +372,19 @@ public class SnowFight extends TeamGame
 		if (proj == null)
 			return;
 		
+		if(proj instanceof Fireball)
+			return;
+		
 		if(proj instanceof Egg) 
 		{
 			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 100, 1));
 			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 40, 0));
+			event.AddMod("Egg", "Egg", 3, true);
 		}
 			
-		event.AddMod("Snowball", "Snowball", 2, true);
+		if(proj instanceof Snowball) 
+			event.AddMod("Snowball", "Snowball", 2, true);
+		
 		event.SetIgnoreRate(true);
 		event.SetIgnoreArmor(true);
 
@@ -310,4 +397,192 @@ public class SnowFight extends TeamGame
 	{
 		return block.getTypeId() == 78 || block.getTypeId() == 80;
 	}
+	
+	private boolean IsOnIce(Player player)
+	{
+		return player.getLocation().getBlock().getRelative(BlockFace.DOWN).getType() == Material.ICE;
+	}
+	
+	
+	private void makeMeteor()
+	{
+
+		Location loc = getEndgameLocation();
+
+		if (loc == null)
+		{
+			return;
+		}
+
+		summonMeteor(loc, 20F);
+
+	}
+
+	private void summonMeteor(Location loc, float fireballSize)
+	{
+		Vector vector = new Vector(UtilMath.random.nextDouble() - 0.5D, 0.8, UtilMath.random.nextDouble() - 0.5D).normalize();
+
+		vector.multiply(40);
+
+		loc.add((UtilMath.random.nextDouble() - 0.5) * 7, 0, (UtilMath.random.nextDouble() - 0.5) * 7);
+
+		loc.add(vector);
+
+		final FallingBlock fallingblock = loc.getWorld().spawnFallingBlock(loc, Material.ICE, (byte) 0);
+
+		fallingblock.setMetadata("Meteor", new FixedMetadataValue(getArcadeManager().getPlugin(), fireballSize));
+
+		new BukkitRunnable()
+		{
+			int i;
+
+			public void run()
+			{
+				if (fallingblock.isValid() && IsLive())
+				{
+					UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, fallingblock.getLocation(), 0.3F, 0.3F, 0.3F, 0, 3,
+							ViewDist.MAX, UtilServer.getPlayers());
+
+					if (i++ % 6 == 0)
+					{
+						fallingblock.getWorld().playSound(fallingblock.getLocation(), Sound.CAT_HISS, 1.3F, 0F);
+					}
+				}
+				else
+				{
+					cancel();
+				}
+			}
+		}.runTaskTimer(getArcadeManager().getPlugin(), 0, 0);
+
+		vector.normalize().multiply(-(0.04 + ((0.5 - 0.05) / 2)));
+		fallingblock.setFireTicks(9999);
+	}
+	
+	@EventHandler
+	public void MeteorHit(EntityChangeBlockEvent event)
+	{
+		Entity projectile = event.getEntity();
+
+		int size = 3;
+		
+		for(int i = 1; i <= 10; i++)
+		{
+			if(System.currentTimeMillis() >= getGameLiveTime() + (((30 * i) + 300) * 1000))
+			{
+				size = 3 * i;
+			}
+		}
+		
+		if (projectile.hasMetadata("Meteor"))
+		{
+			projectile.remove();
+
+			CustomExplosion explosion = new CustomExplosion(getArcadeManager().GetDamage(), getArcadeManager().GetExplosion(),
+					projectile.getLocation(), size, "Meteor");
+
+			explosion.setBlockExplosionSize(size);
+
+			explosion.setFallingBlockExplosionAmount(20);
+
+			explosion.setFallingBlockExplosion(false);
+
+			explosion.setDropItems(false);
+
+			explosion.setBlocksDamagedEqually(true);
+			
+			for(Block block : UtilBlock.getInRadius(event.getEntity().getLocation(), size).keySet())
+			{
+				if(block.getType() != Material.AIR)
+				{
+					block.setType(Material.ICE);
+					if(block.getRelative(BlockFace.DOWN).getType() == Material.AIR)
+					{
+						block.getWorld().spawnFallingBlock(block.getLocation(), block.getType(), block.getData());
+						block.setType(Material.AIR);
+					}
+				}
+			}
+			
+		}
+	}
+	
+	private Location getEndgameLocation()
+	{
+		int chance = UtilMath.r(50) + 3;
+		int accuracy = Math.max((int) (chance - (0.0001 * chance)), 1);
+
+		ArrayList<Player> players = GetPlayers(true);
+
+		for (int a = 0; a < 50; a++)
+		{
+			Player player = players.get(UtilMath.r(players.size()));
+
+			Location location = player.getLocation().add(UtilMath.r(accuracy * 2) - accuracy, 0,
+					UtilMath.r(accuracy * 2) - accuracy);
+
+			location = WorldData.World.getHighestBlockAt(location).getLocation().add(0.5, 0, 0.5);
+
+			if (location.getBlock().getType() == Material.AIR)
+			{
+				location.add(0, -1, 0);
+			}
+
+			if (location.getBlockY() > 0 && location.getBlock().getType() != Material.AIR)
+			{
+				return location;
+			}
+		}
+
+		return null;
+	}
+	
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		Scoreboard.Reset();
+
+		Scoreboard.WriteBlank();
+		if(GetPlayers(true).size() <= 8)
+		{
+			for (GameTeam team : this.GetTeamList())
+			{			
+				for(Player player : team.GetPlayers(true))
+				{
+					Scoreboard.Write(team.GetColor() + player.getName());
+				}
+
+				Scoreboard.WriteBlank();
+			}
+		} 
+		else
+		{
+			for (GameTeam team : this.GetTeamList())
+			{			
+				Scoreboard.Write(team.GetColor() + C.Bold + team.GetName());
+				Scoreboard.Write(team.GetColor() + "Alive " + team.GetPlayers(true).size());
+				Scoreboard.WriteBlank();
+			}
+		}
+
+		long time = 1000 * 60 * 4 - (System.currentTimeMillis() - this.GetStateTime());
+
+		if (time > 0)
+		{
+			Scoreboard.Write(C.cYellow + C.Bold + "Meteoroids:");
+			if(IsLive())
+				Scoreboard.Write(UtilTime.MakeStr(time, 0));
+		}
+		else
+		{
+			Scoreboard.Write(C.cGold + C.Bold + "Meteoroids!");
+		}	
+
+		Scoreboard.Draw();
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
index e0921999c..99195e72c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
@@ -25,9 +25,14 @@ public class KitMedic extends Kit
 
 				new String[] 
 						{
-				"You get 1 Snowball every 2 tiles you break!",
-				"Recieve 5 health potions!",
-				"You get a Soup!"
+				"To the rescue...!",
+				" ",
+				"Gets 1 Snowball every second tile.",
+				"Left-Click Snow to pick up Snowballs (Max. 16)",
+				"Right-Click Snowballs to throw them.",
+				" ",
+				"Has 5 Healing Potions.",
+				"Right-Click Potions to throw them and heal nearby Players."
 						}, 
 
 						new Perk[] 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
index 96d8c7628..78691a611 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
@@ -25,9 +25,13 @@ public class KitSportsman extends Kit
 
 				new String[] 
 						{
-				"You get 1 Snowball per tile you break!",
-				"Recieve a compass!",
-				"You get Soups and Speed!"
+				"Trained to be the fastest on snow and ice.",
+				"",
+				"Gets 1 Snowball every tile",
+				"Left-Click Snow to pick up Snowballs (Max. 16)",
+				"Right-Click Snowballs to throw them.",
+				"",
+				"Use your compass to find and kill your enemies."
 						}, 
 
 						new Perk[] 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
index 97db5e7cd..0dc4c3054 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
@@ -5,6 +5,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkFallDamage;
 
 import org.bukkit.Color;
 import org.bukkit.Material;
@@ -22,11 +23,18 @@ public class KitTactician extends Kit
 		super(manager, "Tactician", KitAvailability.Free, 
 					new String[] 
 						{
-						"You get 1 Snowball every 2 tiles you break!",
-						"get 1 Slow Egg every 16 Seconds! (max. 2)",
-						"You get Soups!"
+						"No Snowfight is complete without a tactical game!",
+						" ",
+						"Gets 1 Snowball every second tile.",
+						"Left-Click Snow to pick up Snowballs (Max. 16)",
+						"Right-Click Snowballs to throw them.",
+						" ",
+						"Gets 1 Slow Egg every 16 seconds (Max. 2)",
+						"Right-Click Slow Eggs to throw them.",
+						"Causes Blindness and Slowness II when hit."
 								}, new Perk[] 
 								{
+									new PerkFallDamage(2)
 								}, 
 								EntityType.SKELETON,
 								new ItemStack(Material.EGG));

From d41fcb1b7b6ed637a75964b05cfda855500cdcee Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sat, 11 Jul 2015 18:44:33 +0200
Subject: [PATCH 006/113] Improving the SSM Team Game.

---
 .../src/nautilus/game/arcade/GameType.java    |   8 +-
 .../game/games/smash/SoloSuperSmash.java      | 135 +++++++
 .../arcade/game/games/smash/SuperSmash.java   | 215 ++++++----
 .../game/games/smash/SuperSmashTeam.java      | 377 ------------------
 .../game/games/smash/TeamSuperSmash.java      | 155 +++++++
 5 files changed, 427 insertions(+), 463 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashTeam.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index fe73d8673..8d5549962 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -38,9 +38,9 @@ import nautilus.game.arcade.game.games.runner.Runner;
 import nautilus.game.arcade.game.games.searchanddestroy.SearchAndDestroy;
 import nautilus.game.arcade.game.games.sheep.SheepGame;
 import nautilus.game.arcade.game.games.skywars.Skywars;
-import nautilus.game.arcade.game.games.smash.SuperSmash;
+import nautilus.game.arcade.game.games.smash.SoloSuperSmash;
 import nautilus.game.arcade.game.games.smash.SuperSmashDominate;
-import nautilus.game.arcade.game.games.smash.SuperSmashTeam;
+import nautilus.game.arcade.game.games.smash.TeamSuperSmash;
 import nautilus.game.arcade.game.games.snake.Snake;
 import nautilus.game.arcade.game.games.sneakyassassins.SneakyAssassins;
 import nautilus.game.arcade.game.games.snowfight.SnowFight;
@@ -96,9 +96,9 @@ public enum GameType
 	SearchAndDestroy(SearchAndDestroy.class, GameDisplay.SearchAndDestroy),
 	Sheep(SheepGame.class, GameDisplay.Sheep),
 	
-	Smash(SuperSmash.class, GameDisplay.Smash),
+	Smash(SoloSuperSmash.class, GameDisplay.Smash),
 	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	SmashTeams(SuperSmashTeam.class, GameDisplay.SmashTeams),
+	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams),
 	Snake(Snake.class, GameDisplay.Snake),
 	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
 	SnowFight(SnowFight.class, GameDisplay.SnowFight),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
new file mode 100644
index 000000000..9e1679da6
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
@@ -0,0 +1,135 @@
+package nautilus.game.arcade.game.games.smash;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.C;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.Game.GameState;
+
+public class SoloSuperSmash extends SuperSmash
+{
+
+	public SoloSuperSmash(ArcadeManager manager)
+	{
+		super(manager, GameType.Smash);
+		
+		this.DamageTeamSelf = true;
+	}
+
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		//Wipe Last
+		Scoreboard.Reset();
+
+		if (GetPlayers(true).size() > 14)
+		{
+			Scoreboard.WriteBlank();
+			Scoreboard.Write(C.cGreen + "Players Alive");
+			Scoreboard.Write(GetPlayers(true).size() + " ");
+
+			Scoreboard.WriteBlank();
+			Scoreboard.Write(C.cRed + "Players Dead");
+			Scoreboard.Write((GetPlayers(false).size() - GetPlayers(true).size()) + "  ");
+		}
+		else
+		{
+			Scoreboard.WriteBlank();
+
+			//Write New
+			for (Player player : GetPlayers(true))
+			{
+				int lives = GetLives(player);
+
+				String out;
+				if (lives >= 4)			out = C.cGreen + player.getName();
+				else if (lives == 3)	out = C.cYellow + player.getName();
+				else if (lives == 2)	out = C.cGold + player.getName();
+				else if (lives == 1)	out = C.cRed + player.getName();
+				else if (lives == 0)	out = C.cRed + player.getName();
+				else
+					continue;
+
+				Scoreboard.WriteOrdered("Lives", out, lives, true);
+			}
+		}
+
+		Scoreboard.Draw();
+	}
+
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		if (GetPlayers(true).size() <= 1)
+		{	
+			ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true);
+			
+			//Announce
+			AnnounceEnd(places);
+
+			//Gems
+			if (places.size() >= 1)
+				AddGems(places.get(0), 20, "1st Place", false, false);
+
+			if (places.size() >= 2)
+				AddGems(places.get(1), 15, "2nd Place", false, false);
+
+			if (places.size() >= 3)
+				AddGems(places.get(2), 10, "3rd Place", false, false);
+
+			for (Player player : GetPlayers(false))
+				if (player.isOnline())
+					AddGems(player, 10, "Participation", false, false);
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (GetState().ordinal() >= GameState.End.ordinal())
+		{
+			List<Player> places = GetTeamList().get(0).GetPlacements(true);
+
+			if (places.isEmpty() || !places.get(0).isOnline())
+				return Arrays.asList();
+			else
+				return Arrays.asList(places.get(0));
+		}
+		else
+			return null;
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		List<Player> winners = getWinners();
+
+		if (winners == null)
+			return null;
+
+		List<Player> losers = GetTeamList().get(0).GetPlayers(false);
+
+		losers.removeAll(winners);
+
+		return losers;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 174dcfd5b..268d53135 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -1,40 +1,16 @@
 package nautilus.game.arcade.game.games.smash;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.bukkit.ChatColor;
-import org.bukkit.FireworkEffect.Type;
-import org.bukkit.Color;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.EnderCrystal;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilTextMiddle;
-import mineplex.core.common.util.UtilTime;
 import mineplex.core.data.BlockData;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.recharge.Recharge;
@@ -45,19 +21,57 @@ import nautilus.game.arcade.ArcadeFormat;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.SoloGame;
 import nautilus.game.arcade.game.GameTeam.PlayerState;
-import nautilus.game.arcade.game.games.smash.kits.*;
+import nautilus.game.arcade.game.games.smash.kits.KitBlaze;
+import nautilus.game.arcade.game.games.smash.kits.KitChicken;
+import nautilus.game.arcade.game.games.smash.kits.KitCreeper;
+import nautilus.game.arcade.game.games.smash.kits.KitEnderman;
+import nautilus.game.arcade.game.games.smash.kits.KitGolem;
+import nautilus.game.arcade.game.games.smash.kits.KitMagmaCube;
+import nautilus.game.arcade.game.games.smash.kits.KitPig;
+import nautilus.game.arcade.game.games.smash.kits.KitSheep;
+import nautilus.game.arcade.game.games.smash.kits.KitSkeletalHorse;
+import nautilus.game.arcade.game.games.smash.kits.KitSkeleton;
+import nautilus.game.arcade.game.games.smash.kits.KitSkySquid;
+import nautilus.game.arcade.game.games.smash.kits.KitSlime;
+import nautilus.game.arcade.game.games.smash.kits.KitSnowman;
+import nautilus.game.arcade.game.games.smash.kits.KitSpider;
+import nautilus.game.arcade.game.games.smash.kits.KitWitch;
+import nautilus.game.arcade.game.games.smash.kits.KitWitherSkeleton;
+import nautilus.game.arcade.game.games.smash.kits.KitWolf;
+import nautilus.game.arcade.game.games.smash.kits.KitZombie;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.SmashKit;
-import nautilus.game.arcade.stats.KillFastStatTracker;
 import nautilus.game.arcade.stats.FreeKitWinStatTracker;
+import nautilus.game.arcade.stats.KillFastStatTracker;
 import nautilus.game.arcade.stats.OneVThreeStatTracker;
 import nautilus.game.arcade.stats.RecoveryMasterStatTracker;
 import nautilus.game.arcade.stats.WinWithoutDyingStatTracker;
 
-public class SuperSmash extends SoloGame
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.FireworkEffect.Type;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.EnderCrystal;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public abstract class SuperSmash extends Game
 {
 	private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
 
@@ -66,11 +80,16 @@ public class SuperSmash extends SoloGame
 	private EnderCrystal _powerup = null;
 	private long _nextPowerup = 0;
 	
+	public boolean Teams = false;
+	public boolean ForceTeamSize = true;
+	public int PlayersPerTeam = 2;
+	public int TeamCount = 0;
+	
 	private HashSet<BlockData> _restoreBlock = new HashSet<BlockData>();
 
-	public SuperSmash(ArcadeManager manager) 
+	public SuperSmash(ArcadeManager manager, GameType type) 
 	{
-		super(manager, GameType.Smash,
+		super(manager, type,
 
 				new Kit[]
 						{
@@ -110,8 +129,6 @@ public class SuperSmash extends SoloGame
 
 		this.DeathOut = false;
 
-		this.DamageTeamSelf = true;
-
 		this.CompassEnabled = true;
 
 		this.DeathSpectateSecs = 4;
@@ -119,10 +136,10 @@ public class SuperSmash extends SoloGame
 		this.SpawnDistanceRequirement = 32;
 
 		this.WorldWaterDamage = 1000;
-
+		
 		// Add stat table here
 		// Example
-		//Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses");
+		// Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses");
 
 		registerStatTrackers(
 				new WinWithoutDyingStatTracker(this, "MLGPro"),
@@ -144,6 +161,84 @@ public class SuperSmash extends SoloGame
 		
 		_nextPowerup = (long) (System.currentTimeMillis() + 240000 + 360000 * Math.random());
 	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event) 
+	{	
+		if (event.GetState() != GameState.Recruit)
+			return;
+		
+		if(this.Teams)
+		{
+			ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
+			this.GetTeamList().clear();
+		
+			TeamColors color = TeamColors.DARK_AQUA;
+		
+			if(!this.ForceTeamSize) 
+			{
+				for(int i = 1; i <= this.TeamCount; i++)
+				{
+					color = getNextColor(color);
+					GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+					team.SetVisible(true);
+					GetTeamList().add(team);
+				}
+			}
+			else 
+			{
+				for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
+				{
+					System.out.println("Test");
+					color = getNextColor(color);
+					GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+					team.SetVisible(true);
+					GetTeamList().add(team);
+				}
+			}
+		}
+	}
+	
+	private enum TeamColors
+	{
+	
+		YELLOW(ChatColor.YELLOW),
+		GREEN(ChatColor.GREEN),
+		AQUA(ChatColor.AQUA),
+		DARK_RED(ChatColor.DARK_RED),
+		GOLD(ChatColor.GOLD),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
+		DARK_BLUE(ChatColor.DARK_BLUE),
+		WHITE(ChatColor.WHITE),
+		BLUE(ChatColor.BLUE),
+		DARK_GREEN(ChatColor.DARK_GREEN),
+		DARK_PURPLE(ChatColor.DARK_PURPLE),
+		DARK_AQUA(ChatColor.DARK_AQUA);
+		
+		private ChatColor color;
+		
+		private TeamColors(ChatColor color)
+		{
+			this.color = color;
+		}
+		
+		public ChatColor getColor()
+		{
+			return this.color;
+		}
+		
+	}
+	
+	private TeamColors getNextColor(TeamColors color) 
+	{
+		for(TeamColors colors : TeamColors.values()) {
+			if(colors.ordinal() == color.ordinal() + 1)
+			{	
+				return colors;
+			}
+		}
+		return TeamColors.YELLOW;
+	}
 
 	@EventHandler
 	public void PlayerOut(PlayerDeathEvent event)
@@ -154,7 +249,7 @@ public class SuperSmash extends SoloGame
 		}
 	}
 
-	private int GetLives(Player player)
+	public int GetLives(Player player)
 	{
 		if (!_lives.containsKey(player))
 			return 0;
@@ -165,7 +260,7 @@ public class SuperSmash extends SoloGame
 		return _lives.get(player);
 	}
 
-	private boolean LoseLife(Player player) 
+	public boolean LoseLife(Player player) 
 	{
 		int lives = GetLives(player) - 1;
 
@@ -188,51 +283,6 @@ public class SuperSmash extends SoloGame
 		}
 	}
 
-	@Override
-	@EventHandler
-	public void ScoreboardUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
-		//Wipe Last
-		Scoreboard.Reset();
-
-		if (GetPlayers(true).size() > 14)
-		{
-			Scoreboard.WriteBlank();
-			Scoreboard.Write(C.cGreen + "Players Alive");
-			Scoreboard.Write(GetPlayers(true).size() + " ");
-
-			Scoreboard.WriteBlank();
-			Scoreboard.Write(C.cRed + "Players Dead");
-			Scoreboard.Write((GetPlayers(false).size() - GetPlayers(true).size()) + "  ");
-		}
-		else
-		{
-			Scoreboard.WriteBlank();
-
-			//Write New
-			for (Player player : GetPlayers(true))
-			{
-				int lives = GetLives(player);
-
-				String out;
-				if (lives >= 4)			out = C.cGreen + player.getName();
-				else if (lives == 3)	out = C.cYellow + player.getName();
-				else if (lives == 2)	out = C.cGold + player.getName();
-				else if (lives == 1)	out = C.cRed + player.getName();
-				else if (lives == 0)	out = C.cRed + player.getName();
-				else
-					continue;
-
-				Scoreboard.WriteOrdered("Lives", out, lives, true);
-			}
-		}
-
-		Scoreboard.Draw();
-	}
-
 	@EventHandler
 	public void powerupSpawn(UpdateEvent event)
 	{
@@ -535,4 +585,5 @@ public class SuperSmash extends SoloGame
 	{
 		return "Deathmatch";
 	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashTeam.java
deleted file mode 100644
index 4f4507bd3..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmashTeam.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package nautilus.game.arcade.game.games.smash;
-
-import java.util.HashMap;
-
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-import nautilus.game.arcade.ArcadeFormat;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.events.GameStateChangeEvent;
-import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.GameTeam.PlayerState;
-import nautilus.game.arcade.game.TeamGame;
-import nautilus.game.arcade.game.games.smash.kits.*;
-import nautilus.game.arcade.kit.Kit;
-
-public class SuperSmashTeam extends TeamGame
-{
-	private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
-
-	public SuperSmashTeam(ArcadeManager manager) 
-	{
-		super(manager, GameType.SmashTeams,
-
-				new Kit[]
-						{
-				
-				new KitSkeleton(manager),
-				new KitGolem(manager),
-				new KitSpider(manager),
-				new KitSlime(manager),
-
-				new KitCreeper(manager),
-				new KitEnderman(manager), 
-				new KitSnowman(manager),
-				new KitWolf(manager),
-
-
-				new KitBlaze(manager),
-				new KitWitch(manager),
-				new KitChicken(manager),
-				new KitSkeletalHorse(manager),
-				new KitPig(manager),
-				new KitSkySquid(manager),
-				new KitWitherSkeleton(manager),
-				new KitMagmaCube(manager),
-
-				new KitSheep(manager)
-
-						},
-
-						new String[]
-								{
-				"Each player has 3 respawns",
-				"Attack to restore hunger!",
-				"Last player alive wins!"
-
-								});
-
-		this.DeathOut = false;
-
-		this.DamageTeamSelf = false;
-		
-		this.CompassEnabled = true;
-		
-		this.SpawnDistanceRequirement = 16;
-		
-		this.TeamArmorHotbar = true;
-	}
-	
-	@EventHandler(priority = EventPriority.HIGH)
-	public void GameStateChange(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Prepare)
-			return;
-
-		for (Player player : GetPlayers(true))
-			_lives.put(player, 4);
-	}
-
-	@EventHandler
-	public void PlayerOut(PlayerDeathEvent event)
-	{
-		if (!LoseLife(event.getEntity()))
-		{
-			this.SetPlayerState(event.getEntity(), PlayerState.OUT);
-		}
-	}
-
-	private int GetLives(Player player)
-	{
-		if (!_lives.containsKey(player))
-			return 0;
-		
-		if (!IsAlive(player))
-			return 0;  
-		
-		return _lives.get(player);
-	}
-	
-	private boolean LoseLife(Player player) 
-	{
-		int lives = GetLives(player) - 1;
-		
-		if (lives > 0)
-		{
-			UtilPlayer.message(player, C.cRed + C.Bold + "You have died!");
-			UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + " lives left!");
-			player.playSound(player.getLocation(), Sound.NOTE_BASS_GUITAR, 2f, 0.5f);
-			
-			_lives.put(player, lives);
-			
-			return true;
-		}
-		else
-		{
-			UtilPlayer.message(player, C.cRed + C.Bold + "You are out of the game!");
-			player.playSound(player.getLocation(), Sound.EXPLODE, 2f, 1f);
-			
-			return false;
-		}
-	}
-
-	@Override
-	@EventHandler
-	public void ScoreboardUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
-		//Wipe Last
-		Scoreboard.Reset();
-
-		if (GetPlayers(true).size() > 14)
-		{
-			for (GameTeam team : this.GetTeamList())
-			{
-				Scoreboard.WriteBlank();
-				Scoreboard.Write(team.GetFormattedName());
-				
-				int lives = 0;
-				for (Player player : team.GetPlayers(true))
-					lives += GetLives(player);
-				
-				Scoreboard.Write(team.GetColor() + "" + lives + " Lives");
-			}
-		}
-		else
-		{
-			Scoreboard.WriteBlank();
-			
-			//Write New
-			for (Player player : GetPlayers(true))
-			{
-				int lives = GetLives(player);
-				
-				if (lives <= 0)	
-					continue;
-				
-				Scoreboard.WriteOrdered("Lives", GetTeam(player).GetColor() + player.getName(), lives, true);
-			}
-		}
-		
-		Scoreboard.Draw();
-	}
-	
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void FallDamage(CustomDamageEvent event)
-	{
-		if (event.IsCancelled())
-			return;
-		
-		if (event.GetCause() == DamageCause.FALL)
-			event.SetCancelled("No Fall Damage");
-	}
-	
-	@EventHandler(priority = EventPriority.HIGH)
-	public void Knockback(CustomDamageEvent event)
-	{
-		if (event.IsCancelled())
-			return;
-		
-		if (event.GetDamageePlayer() != null)
-			event.AddKnockback("Smash Knockback", 1 + 0.1 * (20 - event.GetDamageePlayer().getHealth()));
-	}
-	
-	@EventHandler(priority = EventPriority.HIGH)
-	public void ArenaWalls(CustomDamageEvent event)
-	{
-		if (event.IsCancelled())
-			return;
-
-		if (event.GetCause() == DamageCause.VOID || event.GetCause() == DamageCause.LAVA)
-		{
-			event.GetDamageeEntity().eject();
-			event.GetDamageeEntity().leaveVehicle();
-			
-			event.AddMod("Smash", "Super Smash Mobs", 5000, false);
-		}	
-	}
-	
-	@EventHandler
-	public void HealthChange(EntityRegainHealthEvent event)
-	{
-		if (event.getRegainReason() == RegainReason.SATIATED)
-			event.setCancelled(true);
-	}
-	
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void EntityDeath(EntityDeathEvent event)
-	{
-		event.getDrops().clear();
-	}
-	
-	@Override
-	public void SetKit(Player player, Kit kit, boolean announce) 
-	{
-		GameTeam team = GetTeam(player);
-		if (team != null)
-		{
-			if (!team.KitAllowed(kit))
-			{
-				player.playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 0.5f);
-				UtilPlayer.message(player, F.main("Kit", F.elem(team.GetFormattedName()) + " cannot use " + F.elem(kit.GetFormattedName() + " Kit") + "."));
-				return;
-			}
-		}
-
-		_playerKit.put(player, kit);
-
-		if (announce)
-		{
-			player.playSound(player.getLocation(), Sound.ORB_PICKUP, 2f, 1f);
-			UtilPlayer.message(player, F.main("Kit", "You equipped " + F.elem(kit.GetFormattedName() + " Kit") + "."));
-			kit.ApplyKit(player);
-			UtilInv.Update(player);
-		}
-	}
-	
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void AbilityDescription(PlayerInteractEvent event)
-	{
-		if (event.isCancelled())
-			return;
-		
-		Player player = event.getPlayer();
-		
-		if (player.getItemInHand() == null)
-			return;
-		
-		if (player.getItemInHand().getItemMeta() == null)
-			return;
-		
-		if (player.getItemInHand().getItemMeta().getDisplayName() == null)
-			return;
-		
-		if (player.getItemInHand().getItemMeta().getLore() == null)
-			return;
-		
-		if (Manager.GetGame() == null || Manager.GetGame().GetState() != GameState.Recruit)
-			return;
-		
-		for (int i=player.getItemInHand().getItemMeta().getLore().size() ; i<=7 ; i++)
-			UtilPlayer.message(player, " ");
-		
-		UtilPlayer.message(player, ArcadeFormat.Line);
-
-		UtilPlayer.message(player, "§aAbility - §f§l" + player.getItemInHand().getItemMeta().getDisplayName());
-		
-		//Perk Descs
-		for (String line : player.getItemInHand().getItemMeta().getLore())
-		{
-			UtilPlayer.message(player, line);
-		}
-		
-		UtilPlayer.message(player, ArcadeFormat.Line);
-		
-		player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 2f);
-		
-		event.setCancelled(true);
-	} 
-	
-	@Override
-	public double GetKillsGems(Player killer, Player killed, boolean assist)
-	{
-		return 4;
-	}
-	
-	@EventHandler
-	public void BlockFade(BlockFadeEvent event)
-	{
-		event.setCancelled(true);
-	}
-	
-	private int hungerTick = 0;
-	@EventHandler
-	public void Hunger(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.SEC)
-			return;
-		
-		if (!IsLive())
-			return;
-		
-		hungerTick = (hungerTick + 1)%6;
-		
-		for (Player player : GetPlayers(true))
-		{
-			player.setSaturation(3f); 
-			player.setExhaustion(0f);
-			
-			if (player.getFoodLevel() <= 0)
-			{
-				Manager.GetDamage().NewDamageEvent(player, null, null, 
-						DamageCause.STARVATION, 1, false, true, false,
-						"Starvation", GetName());
-				
-				UtilPlayer.message(player, F.main("Game", "Attack other players to restore hunger!"));
-			}
-			
-			if (hungerTick == 0)
-				UtilPlayer.hunger(player, -1);
-		}
-	}
-	
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void HungerRestore(CustomDamageEvent event)
-	{
-
-		if (event.IsCancelled())
-			return;
-		
-		if (event.GetDamagerPlayer(true) == null)
-			return;
-		
-		if (event.GetDamageePlayer() == null)
-			return;
-		
-		if (GetTeam(event.GetDamageePlayer()) == null)
-			return;
-
-		Player damager = event.GetDamagerPlayer(true);
-		if (damager == null)
-			return;
-		
-		if (GetTeam(damager) == null)
-			return;
-		
-		if (GetTeam(damager).equals(GetTeam(event.GetDamageePlayer())))
-			return;
-			
-		if (!Recharge.Instance.use(damager, "Hunger Restore", 250, false, false))
-			return;
-
-		int amount = Math.max(1, (int)(event.GetDamage()/2));
-		UtilPlayer.hunger(damager, amount);
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
new file mode 100644
index 000000000..2b9d91664
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -0,0 +1,155 @@
+package nautilus.game.arcade.game.games.smash;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.ArcadeFormat;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.GameTeam.PlayerState;
+import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.smash.kits.*;
+import nautilus.game.arcade.kit.Kit;
+
+public class TeamSuperSmash extends SuperSmash
+{
+
+	public TeamSuperSmash(ArcadeManager manager) 
+	{
+		super(manager, GameType.SmashTeams);
+		
+		this.Teams = true;
+		this.PlayersPerTeam = 2;
+	}
+
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		//Wipe Last
+		Scoreboard.Reset();
+
+		if (GetPlayers(true).size() > 14)
+		{
+			for (GameTeam team : this.GetTeamList())
+			{
+				Scoreboard.WriteBlank();
+				Scoreboard.Write(team.GetFormattedName());
+				
+				int lives = 0;
+				for (Player player : team.GetPlayers(true))
+					lives += GetLives(player);
+				
+				Scoreboard.Write(team.GetColor() + "" + lives + " Lives");
+			}
+		}
+		else
+		{
+			Scoreboard.WriteBlank();
+			
+			//Write New
+			for (Player player : GetPlayers(true))
+			{
+				int lives = GetLives(player);
+				
+				if (lives <= 0)	
+					continue;
+				
+				Scoreboard.WriteOrdered("Lives", GetTeam(player).GetColor() + player.getName(), lives, true);
+			}
+		}
+		
+		Scoreboard.Draw();
+	}
+
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		ArrayList<GameTeam> teamsAlive = new ArrayList<GameTeam>();
+
+		for (GameTeam team : this.GetTeamList())
+			if (team.GetPlayers(true).size() > 0)
+				teamsAlive.add(team);
+
+		if (teamsAlive.size() <= 1)
+		{
+			//Announce
+			if (teamsAlive.size() > 0)
+				AnnounceEnd(teamsAlive.get(0));
+
+			for (GameTeam team : GetTeamList())
+			{
+				if (WinnerTeam != null && team.equals(WinnerTeam))
+				{
+					for (Player player : team.GetPlayers(false))
+						AddGems(player, 10, "Winning Team", false, false);
+				}
+
+				for (Player player : team.GetPlayers(false))
+					if (player.isOnline())
+						AddGems(player, 10, "Participation", false, false);
+			}
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		return WinnerTeam.GetPlayers(false);
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		List<Player> players = new ArrayList<>();
+
+		for (GameTeam team : GetTeamList())
+		{
+			if (team != WinnerTeam)
+				players.addAll(team.GetPlayers(false));
+		}
+
+		return players;
+	}
+	
+}

From 55a1c311bfb0d8ebbb5bb6ee2f20c52838bf5514 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sun, 12 Jul 2015 00:21:13 +0200
Subject: [PATCH 007/113] Kit improvements and balancing.

---
 .../game/games/snowfight/SnowFight.java       | 122 +++++++++++-------
 .../game/games/snowfight/kits/KitMedic.java   |  88 +++++++++++--
 .../games/snowfight/kits/KitSportsman.java    |  35 ++++-
 .../games/snowfight/kits/KitTactician.java    |  68 +++++++++-
 4 files changed, 253 insertions(+), 60 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index bf7e83c1c..a5a70a5a9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -1,9 +1,12 @@
 package nautilus.game.arcade.game.games.snowfight;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
@@ -57,6 +60,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
@@ -72,11 +76,14 @@ import org.bukkit.potion.PotionType;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
+
 public class SnowFight extends TeamGame
 {
 
 	private HashMap<Player, Integer> _tiles;
 	private boolean _meteoroids;
+	private boolean _peace;
 
 	public SnowFight(ArcadeManager manager)
 	{
@@ -100,8 +107,11 @@ public class SnowFight extends TeamGame
 		this.CompassGiveItem = false;
 		this.TeamArmor = true;
 		this.TeamArmorHotbar = true;
+		this.BlockPlace = true;
+		this.BlockBreakAllow = new HashSet<>(Arrays.asList(Material.FENCE.getId()));
 		this._tiles = new HashMap<Player, Integer>();
 		this._meteoroids = false;
+		this._peace = false;
 	}
 
 	@EventHandler
@@ -120,33 +130,10 @@ public class SnowFight extends TeamGame
 		world.setWeatherDuration(40);
 		world.setTime(4000);
 	}
-
-	@EventHandler
-	public void KitItems(UpdateEvent event)
-	{
-		if(!IsLive())
-			return;
-		
-		if (event.getType() == UpdateType.SLOWER)
-		{
-			for (Player player : GetPlayers(true))
-			{
-				if (GetKit(player) instanceof KitTactician)
-				{
-					int amount = 0;
-					if (player.getInventory().getItem(1) != null && player.getInventory().getItem(1).getAmount() <= 2)
-						amount = 2;
-					else 
-						amount = 1;
-					player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.EGG, (byte) 0, amount,  "Slow Egg"));
-				}
-			}
-		}
-	}
 	
 	@EventHandler
 	public void IceDamage(UpdateEvent event) {
-		if(event.getType() != UpdateType.SEC)
+		if(event.getType() != UpdateType.FAST)
 			return;
 		
 		if(!IsLive())
@@ -170,7 +157,21 @@ public class SnowFight extends TeamGame
 		if(!IsLive()) 
 			return;
 		
-		if(System.currentTimeMillis() <= getGameLiveTime() + (4 * 60 * 1000))
+		if(System.currentTimeMillis() <= getGameLiveTime() + (15 * 1000))
+			return;
+		
+		if(!_peace)
+		{
+			for(Player player : GetPlayers(false))
+			{
+				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1F, 1F);
+				UtilTextMiddle.display(C.cGold + C.Bold + "Peace Phase ended", "Kill your enemies", player);
+			}
+			this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "Peace Phase ended");
+			_peace = true;
+		}
+		
+		if(System.currentTimeMillis() <= getGameLiveTime() + (195 * 1000))
 			return;
 		
 		if(!_meteoroids)
@@ -356,12 +357,19 @@ public class SnowFight extends TeamGame
 	public void GenerallDamage(CustomDamageEvent event)
 	{
 		if(event.GetCause() == DamageCause.ENTITY_ATTACK)
-			event.AddMod(event.GetDamagerPlayer(false).getName(), "Melee", 1, true);
+			event.SetCancelled("No Melee");
 	}
 
 	@EventHandler(priority = EventPriority.HIGH)
 	public void SnowballEggDamage(CustomDamageEvent event)
 	{
+		
+		if(!_peace)
+		{
+			event.SetCancelled("Peace Phase");
+			return;
+		}
+		
 		if (event.IsCancelled())
 			return;
 
@@ -374,13 +382,6 @@ public class SnowFight extends TeamGame
 		
 		if(proj instanceof Fireball)
 			return;
-		
-		if(proj instanceof Egg) 
-		{
-			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 100, 1));
-			event.GetDamageePlayer().addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 40, 0));
-			event.AddMod("Egg", "Egg", 3, true);
-		}
 			
 		if(proj instanceof Snowball) 
 			event.AddMod("Snowball", "Snowball", 2, true);
@@ -464,33 +465,45 @@ public class SnowFight extends TeamGame
 	{
 		Entity projectile = event.getEntity();
 
-		int size = 3;
+		float size = 2.5F;
+		double damage = 2.5D;
 		
 		for(int i = 1; i <= 10; i++)
 		{
-			if(System.currentTimeMillis() >= getGameLiveTime() + (((30 * i) + 300) * 1000))
+			if(System.currentTimeMillis() >= getGameLiveTime() + (((30 * i) + 180) * 1000))
 			{
-				size = 3 * i;
+				size = 2.5F * i;
+				damage = 2.5D * i;
 			}
 		}
 		
 		if (projectile.hasMetadata("Meteor"))
 		{
-			projectile.remove();
 
 			CustomExplosion explosion = new CustomExplosion(getArcadeManager().GetDamage(), getArcadeManager().GetExplosion(),
 					projectile.getLocation(), size, "Meteor");
 
 			explosion.setBlockExplosionSize(size);
-
-			explosion.setFallingBlockExplosionAmount(20);
-
 			explosion.setFallingBlockExplosion(false);
-
 			explosion.setDropItems(false);
-
 			explosion.setBlocksDamagedEqually(true);
 			
+			UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, projectile.getLocation(), 1.0F, 1.0F, 1.0F, 1, 3, ViewDist.MAX, UtilServer.getPlayers());
+			for(Player player : UtilServer.getPlayers()) {
+				player.playSound(projectile.getLocation(), Sound.EXPLODE, 1, 1);
+			}
+			
+			boolean fall = true;
+			
+			for(Entity player : projectile.getNearbyEntities(size, size, size))
+			{
+				if(player instanceof Player)
+				{
+					Player damagee = (Player) player;
+					Bukkit.getPluginManager().callEvent(new CustomDamageEvent(damagee, null, null, DamageCause.CUSTOM, damage, false, true, true, "Ice Meteoroid", "Ice Meteoroid", false));
+				}
+			}
+			
 			for(Block block : UtilBlock.getInRadius(event.getEntity().getLocation(), size).keySet())
 			{
 				if(block.getType() != Material.AIR)
@@ -498,7 +511,16 @@ public class SnowFight extends TeamGame
 					block.setType(Material.ICE);
 					if(block.getRelative(BlockFace.DOWN).getType() == Material.AIR)
 					{
-						block.getWorld().spawnFallingBlock(block.getLocation(), block.getType(), block.getData());
+						// to reduce lag
+						if(fall)
+						{
+							block.getWorld().spawnFallingBlock(block.getLocation(), block.getType(), block.getData());
+							fall = false;
+						} 
+						else
+						{
+							fall = true;
+						}
 						block.setType(Material.AIR);
 					}
 				}
@@ -537,6 +559,18 @@ public class SnowFight extends TeamGame
 		return null;
 	}
 	
+	@EventHandler
+	public void Place(BlockPlaceEvent event)
+	{
+		if(event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.ICE
+				|| event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.PACKED_ICE 
+				|| event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.FENCE)
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You cant place a Barrier here!"));
+			event.setCancelled(true);
+		}
+	}
+	
 	@Override
 	@EventHandler
 	public void ScoreboardUpdate(UpdateEvent event)
@@ -569,7 +603,7 @@ public class SnowFight extends TeamGame
 			}
 		}
 
-		long time = 1000 * 60 * 4 - (System.currentTimeMillis() - this.GetStateTime());
+		long time = 1000 * 195 - (System.currentTimeMillis() - this.GetStateTime());
 
 		if (time > 0)
 		{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
index 99195e72c..5f2e324d4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
@@ -1,6 +1,10 @@
 package nautilus.game.arcade.game.games.snowfight.kits;
 
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilMath;
 import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -8,12 +12,19 @@ import nautilus.game.arcade.kit.Perk;
 
 import org.bukkit.Color;
 import org.bukkit.Material;
+import org.bukkit.entity.Egg;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
 
 public class KitMedic extends Kit
@@ -31,8 +42,10 @@ public class KitMedic extends Kit
 				"Left-Click Snow to pick up Snowballs (Max. 16)",
 				"Right-Click Snowballs to throw them.",
 				" ",
-				"Has 5 Healing Potions.",
-				"Right-Click Potions to throw them and heal nearby Players."
+				"Gets 1 Healing Potion every 32 seconds [max. 1]",
+				"Causes Regeneration II and Slowness II when hit.",
+				" ",
+				"Supports all nearby allies with REGENERATION."
 						}, 
 
 						new Perk[] 
@@ -48,12 +61,7 @@ public class KitMedic extends Kit
 	public void GiveItems(Player player)
 	{
 		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-		Potion potion = new Potion(PotionType.INSTANT_HEAL);
-		potion.setLevel(2);
-		potion.setSplash(true);
-		for(int i = 3; i <= 7; i++) {
-			player.getInventory().setItem(i, potion.toItemStack(1));
-		}
+		player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 	}
 	
 	@Override
@@ -65,4 +73,68 @@ public class KitMedic extends Kit
 		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
 	}
 
+	@EventHandler
+	public void Aura(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		 
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!HasKit(player))
+				continue;
+			
+			for (Player other : Manager.GetGame().GetPlayers(true))
+			{
+				if (other.equals(player))
+					continue;
+				
+				if (UtilMath.offset(player, other) > 4)
+					continue;
+				
+				if( Manager.GetGame().GetTeam(player).equals(Manager.GetGame().GetTeam(other)))
+					Manager.GetCondition().Factory().Regen("Aura", other, player, 1.9, 0, false, false, false);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void KitItems(UpdateEvent event)
+	{
+		if(!Manager.GetGame().IsLive())
+			return;
+		
+		if (event.getType() == UpdateType.SLOWER)
+		{
+			for (Player player : Manager.GetGame().GetPlayers(true))
+			{
+				if (!HasKit(player))
+					continue;
+				
+				Potion potion = new Potion(PotionType.INSTANT_HEAL);
+				potion.setSplash(true);
+				player.getInventory().setItem(1, potion.toItemStack(1));
+			}
+		}
+	}
+	
+	@EventHandler
+	public void Splash(PotionSplashEvent event) 
+	{
+		if(event.getEntity().getShooter() instanceof Player)
+		{
+			if(!HasKit((Player) event.getEntity().getShooter()))
+				return;
+			
+			for(Entity entity : event.getAffectedEntities()) 
+			{
+				if(entity instanceof Player) 
+				{
+					Manager.GetCondition().Factory().Slow("Heal Potion", (Player)entity, (Player)event.getEntity().getShooter(), 5.0, 1, false, false, false, false);
+				}
+			}
+			
+		}
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
index 78691a611..9c136295e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
@@ -5,16 +5,21 @@ import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import mineplex.core.common.util.UtilMath;
 import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkFallDamage;
 
 public class KitSportsman extends Kit
 {
@@ -31,11 +36,12 @@ public class KitSportsman extends Kit
 				"Left-Click Snow to pick up Snowballs (Max. 16)",
 				"Right-Click Snowballs to throw them.",
 				"",
-				"Use your compass to find and kill your enemies."
+				"Supports all nearby allies with SPEED."
 						}, 
 
 						new Perk[] 
 								{
+							new PerkFallDamage(5)
 								}, 
 								EntityType.SKELETON,
 								new ItemStack(Material.SNOW_BALL));
@@ -45,10 +51,8 @@ public class KitSportsman extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.COMPASS.getId(), (byte) 0, 1, "§a§lTracking Compass"));
 		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 		player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-		player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, Integer.MAX_VALUE, 0));
 	}
 
 	@Override
@@ -60,4 +64,29 @@ public class KitSportsman extends Kit
 		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
 	}
 	
+	@EventHandler
+	public void Aura(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		 
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!HasKit(player))
+				continue;
+			
+			for (Player other : Manager.GetGame().GetPlayers(true))
+			{
+				if (other.equals(player))
+					continue;
+				
+				if (UtilMath.offset(player, other) > 4)
+					continue;
+				
+				if( Manager.GetGame().GetTeam(player).equals(Manager.GetGame().GetTeam(other)))
+					Manager.GetCondition().Factory().Speed("Aura", other, player, 1.9, 0, false, false, false);
+			}
+		}
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
index 0dc4c3054..a0aec26c1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitTactician.java
@@ -1,6 +1,12 @@
 package nautilus.game.arcade.game.games.snowfight.kits;
 
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -12,8 +18,10 @@ import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.potion.PotionType;
 
 public class KitTactician extends Kit
 {
@@ -29,15 +37,16 @@ public class KitTactician extends Kit
 						"Left-Click Snow to pick up Snowballs (Max. 16)",
 						"Right-Click Snowballs to throw them.",
 						" ",
-						"Gets 1 Slow Egg every 16 seconds (Max. 2)",
-						"Right-Click Slow Eggs to throw them.",
-						"Causes Blindness and Slowness II when hit."
+						"Gets 1 Barrier every 32 seconds [max. 2]",
+						"Place Barriers to improve your defense.",
+						"You cant place Barriers above Ice, Packed Ice or Fences.",
+						" ",
+						"Supports all nearby allies with RESISTANCE."
 								}, new Perk[] 
 								{
-									new PerkFallDamage(2)
 								}, 
 								EntityType.SKELETON,
-								new ItemStack(Material.EGG));
+								new ItemStack(Material.FENCE));
 
 	}
 
@@ -46,6 +55,7 @@ public class KitTactician extends Kit
 	{
 		player.getInventory().setItem(2, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 		player.getInventory().setItem(3, ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.getInventory().setItem(7, ItemStackFactory.Instance.CreateStack(Material.COMPASS.getId(), (byte) 0, 1, "§a§lTracking Compass"));
 	}
 	
 	@Override
@@ -56,5 +66,53 @@ public class KitTactician extends Kit
 		ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS));
 		ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS));
 	}
+	
+	@EventHandler
+	public void Aura(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		 
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!HasKit(player))
+				continue;
+			
+			for (Player other : Manager.GetGame().GetPlayers(true))
+			{
+				if (other.equals(player))
+					continue;
+				
+				if (UtilMath.offset(player, other) > 4)
+					continue;
+				
+				if( Manager.GetGame().GetTeam(player).equals(Manager.GetGame().GetTeam(other)))
+					Manager.GetCondition().Factory().Protection("Aura", other, player, 1.9, 0, false, false, false);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void KitItems(UpdateEvent event)
+	{
+		if(!Manager.GetGame().IsLive())
+			return;
+		
+		if (event.getType() == UpdateType.SLOWEST)
+		{
+			for (Player player : Manager.GetGame().GetPlayers(true))
+			{
+				if (!HasKit(player))
+					continue;
+				
+				int amount = 0;
+				if (player.getInventory().getItem(1) != null && UtilInv.contains(player, Material.FENCE, (byte) 0, 1))
+					amount = 2;
+				else 
+					amount = 1;
+				player.getInventory().setItem(1, ItemStackFactory.Instance.CreateStack(Material.FENCE, (byte) 0, amount,  "Barrier"));
+			}
+		}
+	}
 
 }

From 625f7d3168dadcb7d3a2128a2164c536d882339e Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sun, 12 Jul 2015 00:45:47 +0200
Subject: [PATCH 008/113] Some last small changes.

---
 .../game/games/snowfight/SnowFight.java       | 24 +++++++++----------
 .../game/games/snowfight/kits/KitMedic.java   |  4 ++--
 .../games/snowfight/kits/KitSportsman.java    |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index a5a70a5a9..ae91320a6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -89,18 +89,18 @@ public class SnowFight extends TeamGame
 	{
 		super(manager, GameType.SnowFight,
 
-		new Kit[]
-		{
-				new KitSportsman(manager), 
-				new KitTactician(manager),
-				new KitMedic(manager)
-		},
+					new Kit[]
+						{
+					new KitSportsman(manager), 
+					new KitTactician(manager),
+					new KitMedic(manager)
+						},
 
-		new String[]
-		{
-			"Just like... kill your enemies. with snow.",
-			"Be careful if you are on Ice your body will freeze"
-		});
+						new String[]
+								{
+					"Just like... kill your enemies. with snow.",
+					"Be careful if you are on Ice your body will freeze"
+								});
 
 		this.HungerSet = 20;
 		this.CompassEnabled = true;
@@ -143,7 +143,7 @@ public class SnowFight extends TeamGame
 		{
 			if(IsOnIce(player))
 			{
-				Bukkit.getPluginManager().callEvent(new CustomDamageEvent(player, null, null, DamageCause.CUSTOM, 4.0D, false, true, true, "Ice", "Ice", false));
+				Bukkit.getPluginManager().callEvent(new CustomDamageEvent(player, null, null, DamageCause.CUSTOM, 2.0D, false, true, true, "Ice", "Ice", false));
 			}
 		}
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
index 5f2e324d4..efebaf42e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitMedic.java
@@ -43,7 +43,7 @@ public class KitMedic extends Kit
 				"Right-Click Snowballs to throw them.",
 				" ",
 				"Gets 1 Healing Potion every 32 seconds [max. 1]",
-				"Causes Regeneration II and Slowness II when hit.",
+				"Slowness II when hit.",
 				" ",
 				"Supports all nearby allies with REGENERATION."
 						}, 
@@ -104,7 +104,7 @@ public class KitMedic extends Kit
 		if(!Manager.GetGame().IsLive())
 			return;
 		
-		if (event.getType() == UpdateType.SLOWER)
+		if (event.getType() == UpdateType.SLOWEST)
 		{
 			for (Player player : Manager.GetGame().GetPlayers(true))
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
index 9c136295e..43bd655e3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/kits/KitSportsman.java
@@ -41,7 +41,7 @@ public class KitSportsman extends Kit
 
 						new Perk[] 
 								{
-							new PerkFallDamage(5)
+							new PerkFallDamage(3)
 								}, 
 								EntityType.SKELETON,
 								new ItemStack(Material.SNOW_BALL));

From be194c5493756ae608b7379f8461092ab4384e82 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sun, 12 Jul 2015 01:00:50 +0200
Subject: [PATCH 009/113] Adding Peace Phase Announcement.

---
 .../game/arcade/game/games/snowfight/SnowFight.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index ae91320a6..e06fdc2e8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -28,6 +28,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import mineplex.minecraft.game.core.explosion.CustomExplosion;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.games.snowfight.kits.KitTactician;
@@ -114,6 +115,15 @@ public class SnowFight extends TeamGame
 		this._peace = false;
 	}
 
+	@EventHandler
+	public void GameState(GameStateChangeEvent event) 
+	{
+		if(event.GetState() != GameState.Live)
+			return;
+		
+		this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "15 seconds Peace Phase is starting!");
+	}
+	
 	@EventHandler
 	public void Weather(UpdateEvent event)
 	{

From bd3641cdac516537b752ed2689e9ab6225c5530c Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Sun, 12 Jul 2015 02:51:18 +0200
Subject: [PATCH 010/113] Updating TeamSmash with team Generation Methods.

---
 .../arcade/game/games/smash/SuperSmash.java   |  83 -------------
 .../game/games/smash/TeamSuperSmash.java      | 111 +++++++++++++-----
 2 files changed, 84 insertions(+), 110 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 268d53135..85d5b9db6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -80,11 +80,6 @@ public abstract class SuperSmash extends Game
 	private EnderCrystal _powerup = null;
 	private long _nextPowerup = 0;
 	
-	public boolean Teams = false;
-	public boolean ForceTeamSize = true;
-	public int PlayersPerTeam = 2;
-	public int TeamCount = 0;
-	
 	private HashSet<BlockData> _restoreBlock = new HashSet<BlockData>();
 
 	public SuperSmash(ArcadeManager manager, GameType type) 
@@ -161,84 +156,6 @@ public abstract class SuperSmash extends Game
 		
 		_nextPowerup = (long) (System.currentTimeMillis() + 240000 + 360000 * Math.random());
 	}
-	
-	@EventHandler
-	public void CustomTeamGeneration(GameStateChangeEvent event) 
-	{	
-		if (event.GetState() != GameState.Recruit)
-			return;
-		
-		if(this.Teams)
-		{
-			ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
-			this.GetTeamList().clear();
-		
-			TeamColors color = TeamColors.DARK_AQUA;
-		
-			if(!this.ForceTeamSize) 
-			{
-				for(int i = 1; i <= this.TeamCount; i++)
-				{
-					color = getNextColor(color);
-					GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
-					team.SetVisible(true);
-					GetTeamList().add(team);
-				}
-			}
-			else 
-			{
-				for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
-				{
-					System.out.println("Test");
-					color = getNextColor(color);
-					GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
-					team.SetVisible(true);
-					GetTeamList().add(team);
-				}
-			}
-		}
-	}
-	
-	private enum TeamColors
-	{
-	
-		YELLOW(ChatColor.YELLOW),
-		GREEN(ChatColor.GREEN),
-		AQUA(ChatColor.AQUA),
-		DARK_RED(ChatColor.DARK_RED),
-		GOLD(ChatColor.GOLD),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
-		DARK_BLUE(ChatColor.DARK_BLUE),
-		WHITE(ChatColor.WHITE),
-		BLUE(ChatColor.BLUE),
-		DARK_GREEN(ChatColor.DARK_GREEN),
-		DARK_PURPLE(ChatColor.DARK_PURPLE),
-		DARK_AQUA(ChatColor.DARK_AQUA);
-		
-		private ChatColor color;
-		
-		private TeamColors(ChatColor color)
-		{
-			this.color = color;
-		}
-		
-		public ChatColor getColor()
-		{
-			return this.color;
-		}
-		
-	}
-	
-	private TeamColors getNextColor(TeamColors color) 
-	{
-		for(TeamColors colors : TeamColors.values()) {
-			if(colors.ordinal() == color.ordinal() + 1)
-			{	
-				return colors;
-			}
-		}
-		return TeamColors.YELLOW;
-	}
 
 	@EventHandler
 	public void PlayerOut(PlayerDeathEvent event)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 2b9d91664..ae652d353 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -1,49 +1,31 @@
 package nautilus.game.arcade.game.games.smash;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-import nautilus.game.arcade.ArcadeFormat;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.Game.GameState;
-import nautilus.game.arcade.game.GameTeam.PlayerState;
-import nautilus.game.arcade.game.TeamGame;
-import nautilus.game.arcade.game.games.smash.kits.*;
-import nautilus.game.arcade.kit.Kit;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 
 public class TeamSuperSmash extends SuperSmash
 {
 
+	public boolean ForceTeamSize = true;
+	public int PlayersPerTeam = 2;
+	public int TeamCount = 0;
+	
 	public TeamSuperSmash(ArcadeManager manager) 
 	{
 		super(manager, GameType.SmashTeams);
 		
-		this.Teams = true;
 		this.PlayersPerTeam = 2;
 	}
 
@@ -89,6 +71,81 @@ public class TeamSuperSmash extends SuperSmash
 		
 		Scoreboard.Draw();
 	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event) 
+	{	
+		if (event.GetState() != GameState.Recruit)
+			return;
+		
+		ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
+		this.GetTeamList().clear();
+		
+		TeamColors color = TeamColors.DARK_AQUA;
+		
+		if(!this.ForceTeamSize) 
+		{
+			for(int i = 1; i <= this.TeamCount; i++)
+			{
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+		else 
+		{
+			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
+			{
+				System.out.println("Test");
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+	}
+	
+	private enum TeamColors
+	{
+	
+		YELLOW(ChatColor.YELLOW),
+		GREEN(ChatColor.GREEN),
+		AQUA(ChatColor.AQUA),
+		DARK_RED(ChatColor.DARK_RED),
+		GOLD(ChatColor.GOLD),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
+		DARK_BLUE(ChatColor.DARK_BLUE),
+		WHITE(ChatColor.WHITE),
+		BLUE(ChatColor.BLUE),
+		DARK_GREEN(ChatColor.DARK_GREEN),
+		DARK_PURPLE(ChatColor.DARK_PURPLE),
+		DARK_AQUA(ChatColor.DARK_AQUA);
+		
+		private ChatColor color;
+		
+		private TeamColors(ChatColor color)
+		{
+			this.color = color;
+		}
+		
+		public ChatColor getColor()
+		{
+			return this.color;
+		}
+		
+	}
+	
+	private TeamColors getNextColor(TeamColors color) 
+	{
+		for(TeamColors colors : TeamColors.values()) {
+			if(colors.ordinal() == color.ordinal() + 1)
+			{	
+				return colors;
+			}
+		}
+		return TeamColors.YELLOW;
+	}
 
 	@Override
 	public void EndCheck()

From b1b8fa59f74c3b1166f91236f9a5109e5a264108 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Sun, 12 Jul 2015 21:11:39 -0700
Subject: [PATCH 011/113] Update IntelliJ builds

---
 Plugins/.idea/codeStyleSettings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index 8e890f86b..44295e3d8 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -37,6 +37,7 @@
         </codeStyleSettings>
       </value>
     </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
   </component>
 </project>
\ No newline at end of file

From e72d612379fe2bf9054c04ceefab70e40ccee709 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 05:25:08 +0200
Subject: [PATCH 012/113] Implementing the mapSource parameter in GameType and
 setting up SkywarsTeams and SurvivalGamesTeams.

---
 .../src/mineplex/core/game/GameDisplay.java   |    1 +
 .../src/nautilus/game/arcade/GameType.java    |   35 +-
 .../src/nautilus/game/arcade/game/Game.java   |   13 +-
 .../arcade/game/games/skywars/Skywars.java    |   81 +-
 .../game/games/skywars/SoloSkywars.java       |  156 ++
 .../game/games/skywars/TeamSkywars.java       |  234 +++
 .../game/games/smash/SoloSuperSmash.java      |    7 +-
 .../arcade/game/games/smash/SuperSmash.java   |   12 +-
 .../game/games/smash/TeamSuperSmash.java      |    8 +-
 .../survivalgames/SoloSurvivalGames.java      |  159 ++
 .../games/survivalgames/SurvivalGames.java    |  101 +-
 .../survivalgames/SurvivalGamesTeams.java     | 1630 -----------------
 .../survivalgames/TeamSurvivalGames.java      |  214 +++
 .../nautilus/game/arcade/world/WorldData.java |   10 +-
 14 files changed, 869 insertions(+), 1792 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index 196b046e2..02ed14254 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -61,6 +61,7 @@ public enum GameDisplay
 	Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
 	Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
 	Skywars("Skywars", Material.FEATHER, (byte)5, GameCategory.SURVIVAL, 52),
+	SkywarsTeams("Skywars Teams", Material.FEATHER, (byte)5, GameCategory.TEAM_VARIANT, 53),
 
 	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 8d5549962..f02cf0d08 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -37,7 +37,8 @@ import nautilus.game.arcade.game.games.quiver.QuiverTeams;
 import nautilus.game.arcade.game.games.runner.Runner;
 import nautilus.game.arcade.game.games.searchanddestroy.SearchAndDestroy;
 import nautilus.game.arcade.game.games.sheep.SheepGame;
-import nautilus.game.arcade.game.games.skywars.Skywars;
+import nautilus.game.arcade.game.games.skywars.SoloSkywars;
+import nautilus.game.arcade.game.games.skywars.TeamSkywars;
 import nautilus.game.arcade.game.games.smash.SoloSuperSmash;
 import nautilus.game.arcade.game.games.smash.SuperSmashDominate;
 import nautilus.game.arcade.game.games.smash.TeamSuperSmash;
@@ -48,8 +49,8 @@ import nautilus.game.arcade.game.games.spleef.Spleef;
 import nautilus.game.arcade.game.games.spleef.SpleefTeams;
 import nautilus.game.arcade.game.games.squidshooter.SquidShooter;
 import nautilus.game.arcade.game.games.stacker.Stacker;
-import nautilus.game.arcade.game.games.survivalgames.SurvivalGames;
-import nautilus.game.arcade.game.games.survivalgames.SurvivalGamesTeams;
+import nautilus.game.arcade.game.games.survivalgames.SoloSurvivalGames;
+import nautilus.game.arcade.game.games.survivalgames.TeamSurvivalGames;
 import nautilus.game.arcade.game.games.tug.Tug;
 import nautilus.game.arcade.game.games.turfforts.TurfForts;
 import nautilus.game.arcade.game.games.uhc.UHC;
@@ -98,7 +99,7 @@ public enum GameType
 	
 	Smash(SoloSuperSmash.class, GameDisplay.Smash),
 	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams),
+	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, GameType.Smash),
 	Snake(Snake.class, GameDisplay.Snake),
 	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
 	SnowFight(SnowFight.class, GameDisplay.SnowFight),
@@ -106,8 +107,8 @@ public enum GameType
 	SpleefTeams(SpleefTeams.class, GameDisplay.SpleefTeams),
 	SquidShooter(SquidShooter.class, GameDisplay.SquidShooter),
 	Stacker(Stacker.class, GameDisplay.Stacker),
-	SurvivalGames(SurvivalGames.class, GameDisplay.SurvivalGames),
-	SurvivalGamesTeams(SurvivalGamesTeams.class, GameDisplay.SurvivalGamesTeams),
+	SurvivalGames(SoloSurvivalGames.class, GameDisplay.SurvivalGames),
+	SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, GameType.SurvivalGames),
 	Tug(Tug.class, GameDisplay.Tug),
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
@@ -117,12 +118,14 @@ public enum GameType
 	
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
-	Skywars(Skywars.class, GameDisplay.Skywars),
+	Skywars(SoloSkywars.class, GameDisplay.Skywars),
+	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, GameType.Skywars),
 	
 	Event(EventGame.class, GameDisplay.Event);
 
 	GameDisplay _display;
 	boolean _enforceResourcePack;
+	GameType _mapSource;
 	String _resourcePack;
 	Class<? extends Game> _gameClass;
 	
@@ -131,15 +134,26 @@ public enum GameType
 
 	GameType(Class<? extends Game> gameClass, GameDisplay display)
 	{
-		this(gameClass, display, null, false);
+		this(gameClass, display, null, false, null);
 	}
 
 	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack)
+	{
+		this(gameClass, display, resourcePackUrl, enforceResourcePack, null);
+	}
+	
+	GameType(Class<? extends Game> gameClass, GameDisplay display, GameType mapSource)
+	{
+		this(gameClass, display, null, false, mapSource);
+	}
+	
+	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack, GameType mapSource)
 	{
 		_display = display;
 		_gameClass = gameClass;
 		_resourcePack = resourcePackUrl;
 		_enforceResourcePack = enforceResourcePack;
+		_mapSource = mapSource;
 	}
 
 	public Class<? extends Game> getGameClass()
@@ -156,6 +170,11 @@ public enum GameType
 	{
 		return _resourcePack;
 	}
+	
+	public GameType getMapSource()
+	{
+		return _mapSource;
+	}
 
 	public String GetName()
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index abe4d740c..388bbd632 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -281,7 +281,7 @@ public abstract class Game implements Listener
 		Scoreboard = new GameScoreboard(this);
 
 		//Map Select
-		_files = Manager.LoadFiles(GetName());
+		_files = Manager.LoadFiles(GetWorldHostName());
 		if (Manager.GetGameCreationManager().MapPref != null)
 		{
 			ArrayList<String> matches = new ArrayList<String>();
@@ -341,6 +341,16 @@ public abstract class Game implements Listener
 	{
 		return _gameType.GetName();
 	}
+	
+	public String GetWorldHostName()
+	{
+		String mapSource = GetName();
+		if(GetType().getMapSource() != null)
+		{
+			mapSource = GetType().getMapSource().GetName();
+		}
+		return mapSource;
+	}
 
 	public String GetMode()
 	{
@@ -1365,4 +1375,5 @@ public abstract class Game implements Listener
         //End
         SetState(GameState.End);
 	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index c64af6eaa..b14f2e2f4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -95,7 +95,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
 @SuppressWarnings("deprecation")
-public class Skywars extends SoloGame
+public abstract class Skywars extends Game
 {
 	//./parse 19 30 56
 	
@@ -131,21 +131,16 @@ public class Skywars extends SoloGame
 	private ChestLoot _middleBlock = new ChestLoot();
 
 	@SuppressWarnings("unchecked")
-	public Skywars(ArcadeManager manager)
+	public Skywars(ArcadeManager manager, GameType type, String[] description)
 	{
-		super(manager, GameType.Skywars, new Kit[]
+		super(manager, type, new Kit[]
 				{
 				new KitChicken(manager),
 				new KitMiner(manager),
 				new KitMadScientist(manager), 
 				new KitDestructor(manager), 
 				
-				}, new String[]
-						{
-				"Free for all battle in the sky!", 
-				"Craft or loot gear for combat",
-				"Last player alive wins!"
-						});
+				}, description);
 
 		PrepareFreeze = true;
 
@@ -1196,63 +1191,6 @@ public class Skywars extends SoloGame
 		_oreHider.BlockBreak(event);
 	}
 	
-	@Override
-	@EventHandler
-	public void ScoreboardUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
-		if (GetTeamList().isEmpty())
-			return;
-
-		Scoreboard.Reset();
-
-		GameTeam team = GetTeamList().get(0);
-
-		Scoreboard.WriteBlank();
-		Scoreboard.Write(C.cYellow + C.Bold + "Players");
-		if (team.GetPlayers(true).size() > 4)
-		{
-			Scoreboard.Write("" + team.GetPlayers(true).size());
-		}
-		else
-		{
-			for (Player player : team.GetPlayers(true))
-			{
-				Scoreboard.Write(C.cWhite + player.getName());
-			}
-		}
-		
-		if (IsLive())
-		{
-			Scoreboard.WriteBlank();
-			Scoreboard.Write(C.cYellow + C.Bold + "Time");
-			Scoreboard.Write(UtilTime.convertString(System.currentTimeMillis() - GetStateTime(), 0, TimeUnit.FIT));
-			
-			Scoreboard.WriteBlank();
-			Scoreboard.Write((_tntGen.active() ? C.cGreen : C.cRed) + C.Bold + "TNT Spawn");
-			Scoreboard.Write(_tntGen.getScoreboardInfo());
-			
-			Scoreboard.WriteBlank();
-			
-			if (UtilTime.elapsed(GetStateTime(), _crumbleTime))
-			{
-				Scoreboard.Write(C.cRed + C.Bold + "Map Crumble");
-				Scoreboard.Write("Active");
-			}
-			else
-			{
-				Scoreboard.Write(C.cGreen + C.Bold + "Map Crumble");
-				Scoreboard.Write(UtilTime.convertString(_crumbleTime - (System.currentTimeMillis() - GetStateTime()), 0, TimeUnit.FIT));
-			}
-		}
-		
-
-
-		Scoreboard.Draw();
-	}
-	
 	@EventHandler
 	public void tntDamageAttribute(ExplosionPrimeEvent event)
 	{
@@ -1370,4 +1308,15 @@ public class Skywars extends SoloGame
 		else
 			return 12;
 	}
+	
+	public TNTGenerator getTnTGen() 
+	{
+		return this._tntGen;
+	}
+	
+	public long getCrumbleTime()
+	{
+		return this._crumbleTime;
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
new file mode 100644
index 000000000..0fd06b72b
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
@@ -0,0 +1,156 @@
+package nautilus.game.arcade.game.games.skywars;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.GameTeam;
+
+public class SoloSkywars extends Skywars
+{
+
+	public SoloSkywars(ArcadeManager manager)
+	{
+		super(manager, GameType.Skywars, 
+				 new String[]
+							{
+					"Free for all battle in the sky!", 
+					"Craft or loot gear for combat",
+					"Last player alive wins!"
+							});
+		
+		this.DamageTeamSelf = true;
+		
+	}
+	
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (GetTeamList().isEmpty())
+			return;
+
+		Scoreboard.Reset();
+
+		GameTeam team = GetTeamList().get(0);
+
+		Scoreboard.WriteBlank();
+		Scoreboard.Write(C.cYellow + C.Bold + "Players");
+		if (team.GetPlayers(true).size() > 4)
+		{
+			Scoreboard.Write("" + team.GetPlayers(true).size());
+		}
+		else
+		{
+			for (Player player : team.GetPlayers(true))
+			{
+				Scoreboard.Write(C.cWhite + player.getName());
+			}
+		}
+		
+		if (IsLive())
+		{
+			Scoreboard.WriteBlank();
+			Scoreboard.Write(C.cYellow + C.Bold + "Time");
+			Scoreboard.Write(UtilTime.convertString(System.currentTimeMillis() - GetStateTime(), 0, TimeUnit.FIT));
+			
+			Scoreboard.WriteBlank();
+			Scoreboard.Write((this.getTnTGen().active() ? C.cGreen : C.cRed) + C.Bold + "TNT Spawn");
+			Scoreboard.Write(this.getTnTGen().getScoreboardInfo());
+			
+			Scoreboard.WriteBlank();
+			
+			if (UtilTime.elapsed(GetStateTime(), this.getCrumbleTime()))
+			{
+				Scoreboard.Write(C.cRed + C.Bold + "Map Crumble");
+				Scoreboard.Write("Active");
+			}
+			else
+			{
+				Scoreboard.Write(C.cGreen + C.Bold + "Map Crumble");
+				Scoreboard.Write(UtilTime.convertString(this.getCrumbleTime() - (System.currentTimeMillis() - GetStateTime()), 0, TimeUnit.FIT));
+			}
+		}
+		
+
+
+		Scoreboard.Draw();
+	}
+	
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		if (GetPlayers(true).size() <= 1)
+		{	
+			ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true);
+			
+			//Announce
+			AnnounceEnd(places);
+
+			//Gems
+			if (places.size() >= 1)
+				AddGems(places.get(0), 20, "1st Place", false, false);
+
+			if (places.size() >= 2)
+				AddGems(places.get(1), 15, "2nd Place", false, false);
+
+			if (places.size() >= 3)
+				AddGems(places.get(2), 10, "3rd Place", false, false);
+
+			for (Player player : GetPlayers(false))
+				if (player.isOnline())
+					AddGems(player, 10, "Participation", false, false);
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (GetState().ordinal() >= GameState.End.ordinal())
+		{
+			List<Player> places = GetTeamList().get(0).GetPlacements(true);
+
+			if (places.isEmpty() || !places.get(0).isOnline())
+				return Arrays.asList();
+			else
+				return Arrays.asList(places.get(0));
+		}
+		else
+			return null;
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		List<Player> winners = getWinners();
+
+		if (winners == null)
+			return null;
+
+		List<Player> losers = GetTeamList().get(0).GetPlayers(false);
+
+		losers.removeAll(winners);
+
+		return losers;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
new file mode 100644
index 000000000..2ab16c1aa
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -0,0 +1,234 @@
+package nautilus.game.arcade.game.games.skywars;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.GameTeam;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class TeamSkywars extends Skywars
+{
+
+	public boolean ForceTeamSize = true;
+	public int PlayersPerTeam = 2;
+	public int TeamCount = 0;
+
+	public TeamSkywars(ArcadeManager manager)
+	{
+		super(manager, GameType.SkywarsTeams, 
+				 new String[]
+							{
+					"Free for all battle in the sky!", 
+					"Craft or loot gear for combat",
+					"Last team alive wins!"
+							});
+		
+		this.PlayersPerTeam = 2;
+		
+	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event) 
+	{	
+		if (event.GetState() != GameState.Recruit)
+			return;
+		
+		ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
+		this.GetTeamList().clear();
+		
+		TeamColors color = TeamColors.DARK_AQUA;
+		
+		if(!this.ForceTeamSize) 
+		{
+			for(int i = 1; i <= this.TeamCount; i++)
+			{
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+		else 
+		{
+			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
+			{
+				System.out.println("Test");
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+	}
+	
+	private enum TeamColors
+	{
+	
+		YELLOW(ChatColor.YELLOW),
+		GREEN(ChatColor.GREEN),
+		AQUA(ChatColor.AQUA),
+		DARK_RED(ChatColor.DARK_RED),
+		GOLD(ChatColor.GOLD),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
+		DARK_BLUE(ChatColor.DARK_BLUE),
+		WHITE(ChatColor.WHITE),
+		BLUE(ChatColor.BLUE),
+		DARK_GREEN(ChatColor.DARK_GREEN),
+		DARK_PURPLE(ChatColor.DARK_PURPLE),
+		DARK_AQUA(ChatColor.DARK_AQUA);
+		
+		private ChatColor color;
+		
+		private TeamColors(ChatColor color)
+		{
+			this.color = color;
+		}
+		
+		public ChatColor getColor()
+		{
+			return this.color;
+		}
+		
+	}
+	
+	private TeamColors getNextColor(TeamColors color) 
+	{
+		for(TeamColors colors : TeamColors.values()) {
+			if(colors.ordinal() == color.ordinal() + 1)
+			{	
+				return colors;
+			}
+		}
+		return TeamColors.YELLOW;
+	}
+	
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (GetTeamList().isEmpty())
+			return;
+
+		Scoreboard.Reset();
+
+		Scoreboard.WriteBlank();
+		Scoreboard.Write(C.cYellow + C.Bold + "Teams");
+		if (GetTeamList().size() <= 4)
+		{
+			for(GameTeam team : GetTeamList())
+			{
+				Scoreboard.Write(team.GetColor() + team.GetName() + " " + team.GetSize());
+			}
+		} 
+		else
+		{
+			Scoreboard.Write(C.cYellow + "Players " + GetPlayers(true).size());
+		}
+		
+		if (IsLive())
+		{
+			Scoreboard.WriteBlank();
+			Scoreboard.Write(C.cYellow + C.Bold + "Time");
+			Scoreboard.Write(UtilTime.convertString(System.currentTimeMillis() - GetStateTime(), 0, TimeUnit.FIT));
+			
+			Scoreboard.WriteBlank();
+			Scoreboard.Write((this.getTnTGen().active() ? C.cGreen : C.cRed) + C.Bold + "TNT Spawn");
+			Scoreboard.Write(this.getTnTGen().getScoreboardInfo());
+			
+			Scoreboard.WriteBlank();
+			
+			if (UtilTime.elapsed(GetStateTime(), this.getCrumbleTime()))
+			{
+				Scoreboard.Write(C.cRed + C.Bold + "Map Crumble");
+				Scoreboard.Write("Active");
+			}
+			else
+			{
+				Scoreboard.Write(C.cGreen + C.Bold + "Map Crumble");
+				Scoreboard.Write(UtilTime.convertString(this.getCrumbleTime() - (System.currentTimeMillis() - GetStateTime()), 0, TimeUnit.FIT));
+			}
+		}
+		
+
+
+		Scoreboard.Draw();
+	}
+
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		ArrayList<GameTeam> teamsAlive = new ArrayList<GameTeam>();
+
+		for (GameTeam team : this.GetTeamList())
+			if (team.GetPlayers(true).size() > 0)
+				teamsAlive.add(team);
+
+		if (teamsAlive.size() <= 1)
+		{
+			//Announce
+			if (teamsAlive.size() > 0)
+				AnnounceEnd(teamsAlive.get(0));
+
+			for (GameTeam team : GetTeamList())
+			{
+				if (WinnerTeam != null && team.equals(WinnerTeam))
+				{
+					for (Player player : team.GetPlayers(false))
+						AddGems(player, 10, "Winning Team", false, false);
+				}
+
+				for (Player player : team.GetPlayers(false))
+					if (player.isOnline())
+						AddGems(player, 10, "Participation", false, false);
+			}
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		return WinnerTeam.GetPlayers(false);
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		List<Player> players = new ArrayList<>();
+
+		for (GameTeam team : GetTeamList())
+		{
+			if (team != WinnerTeam)
+				players.addAll(team.GetPlayers(false));
+		}
+
+		return players;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
index 9e1679da6..93dc20790 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
@@ -19,7 +19,12 @@ public class SoloSuperSmash extends SuperSmash
 
 	public SoloSuperSmash(ArcadeManager manager)
 	{
-		super(manager, GameType.Smash);
+		super(manager, GameType.Smash, new String[]
+				{
+				"Each player has 3 respawns",
+				"Attack to restore hunger!",
+				"Last player alive wins!"
+					});
 		
 		this.DamageTeamSelf = true;
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 85d5b9db6..b17ab43d3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -82,7 +82,7 @@ public abstract class SuperSmash extends Game
 	
 	private HashSet<BlockData> _restoreBlock = new HashSet<BlockData>();
 
-	public SuperSmash(ArcadeManager manager, GameType type) 
+	public SuperSmash(ArcadeManager manager, GameType type, String[] description) 
 	{
 		super(manager, type,
 
@@ -112,15 +112,7 @@ public abstract class SuperSmash extends Game
 
 				new KitSheep(manager)
 
-						},
-
-						new String[]
-								{
-				"Each player has 3 respawns",
-				"Attack to restore hunger!",
-				"Last player alive wins!"
-
-								});
+						},description);
 
 		this.DeathOut = false;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index ae652d353..16070df29 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -24,7 +24,13 @@ public class TeamSuperSmash extends SuperSmash
 	
 	public TeamSuperSmash(ArcadeManager manager) 
 	{
-		super(manager, GameType.SmashTeams);
+		super(manager, GameType.SmashTeams, 
+				new String[]
+						{
+				"Each player has 3 respawns",
+				"Attack to restore hunger!",
+				"Last team alive wins!"
+						});
 		
 		this.PlayersPerTeam = 2;
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
new file mode 100644
index 000000000..8d025cd35
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
@@ -0,0 +1,159 @@
+package nautilus.game.arcade.game.games.survivalgames;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.GameTeam;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class SoloSurvivalGames extends SurvivalGames
+{
+
+	public SoloSurvivalGames(ArcadeManager manager)
+	{
+		super(manager, GameType.SurvivalGames,
+				new String[]
+						{
+				"Search for chests to find loot",
+
+				"Slaughter your opponents",
+
+				"Stay away from the borders!",
+
+				"Last tribute alive wins!"
+						});
+		
+		this.DamageTeamSelf = true;
+		
+	}
+
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (GetTeamList().isEmpty())
+			return;
+
+		Scoreboard.Reset();
+
+		Scoreboard.WriteBlank();
+
+		GameTeam team = GetTeamList().get(0);
+
+		Scoreboard.Write(C.cGreen + C.Bold + "Time");
+		Scoreboard.Write(UtilTime.convertString(this.getSecondsSinceStart() * 1000, 0, TimeUnit.FIT));
+
+		Scoreboard.WriteBlank();
+
+		Scoreboard.Write(C.cYellow + C.Bold + "Tributes");
+		if (team.GetPlayers(true).size() > 7)
+		{
+			Scoreboard.Write("" + team.GetPlayers(true).size());
+		}
+		else
+		{
+			for (Player player : team.GetPlayers(true))
+			{
+				Scoreboard.Write(C.cWhite + player.getName());
+			}
+		}
+
+		Scoreboard.WriteBlank();
+
+		if (this.getChestRefillTime() > 0 && this.getDeathMatchTime() > 60)
+		{
+			Scoreboard.Write(C.cGold + C.Bold + "Chest Refill");
+			Scoreboard.Write(UtilTime.convertString(this.getChestRefillTime() * 1000, 0, TimeUnit.FIT));
+		}
+		else if (this.getDeathMatchTime() > 0)
+		{
+			Scoreboard.Write(C.cRed + C.Bold + "Deathmatch");
+			Scoreboard.Write(UtilTime.convertString(
+					Math.min(this.getDeathMatchTime(), this.isDeathMatchTeleported() ? 10 : this.getDeathMatchTime()) * 1000, 0, TimeUnit.FIT));
+		}
+		else
+		{
+			Scoreboard.Write(C.cRed + C.Bold + "Game End");
+			Scoreboard.Write(UtilTime.convertString(Math.max(0, this.getGameEndTime()) * 1000, 0, TimeUnit.FIT));
+		}
+
+		Scoreboard.Draw();
+	}
+	
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		if (GetPlayers(true).size() <= 1)
+		{	
+			ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true);
+			
+			//Announce
+			AnnounceEnd(places);
+
+			//Gems
+			if (places.size() >= 1)
+				AddGems(places.get(0), 20, "1st Place", false, false);
+
+			if (places.size() >= 2)
+				AddGems(places.get(1), 15, "2nd Place", false, false);
+
+			if (places.size() >= 3)
+				AddGems(places.get(2), 10, "3rd Place", false, false);
+
+			for (Player player : GetPlayers(false))
+				if (player.isOnline())
+					AddGems(player, 10, "Participation", false, false);
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (GetState().ordinal() >= GameState.End.ordinal())
+		{
+			List<Player> places = GetTeamList().get(0).GetPlacements(true);
+
+			if (places.isEmpty() || !places.get(0).isOnline())
+				return Arrays.asList();
+			else
+				return Arrays.asList(places.get(0));
+		}
+		else
+			return null;
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		List<Player> winners = getWinners();
+
+		if (winners == null)
+			return null;
+
+		List<Player> losers = GetTeamList().get(0).GetPlayers(false);
+
+		losers.removeAll(winners);
+
+		return losers;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 71d2e3f5c..300ac0c02 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -114,7 +114,7 @@ import net.minecraft.server.v1_7_R4.TileEntityChest;
 import net.minecraft.server.v1_7_R4.WorldServer;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 
-public class SurvivalGames extends SoloGame
+public abstract class SurvivalGames extends Game
 {
 	// Chest loot
 	private ChestLoot _baseLoot = new ChestLoot(true);
@@ -168,9 +168,9 @@ public class SurvivalGames extends SoloGame
 	 */
 	private Field _ticksField;
 
-	public SurvivalGames(ArcadeManager manager)
+	public SurvivalGames(ArcadeManager manager, GameType type, String[] description)
 	{
-		super(manager, GameType.SurvivalGames,
+		super(manager, type,
 
 				new Kit[]
 						{
@@ -195,18 +195,7 @@ public class SurvivalGames extends SoloGame
 				new KitBarbarian(manager),
 
 				new KitHorseman(manager),
-						},
-
-						new String[]
-								{
-				"Search for chests to find loot",
-
-				"Slaughter your opponents",
-
-				"Stay away from the borders!",
-
-				"Last tribute alive wins!"
-								});
+						}, description);
 
 		_help = new String[]
 				{
@@ -1683,62 +1672,6 @@ public class SurvivalGames extends SoloGame
 
 	}
 
-	@Override
-	@EventHandler
-	public void ScoreboardUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
-		if (GetTeamList().isEmpty())
-			return;
-
-		Scoreboard.Reset();
-
-		Scoreboard.WriteBlank();
-
-		GameTeam team = GetTeamList().get(0);
-
-		Scoreboard.Write(C.cGreen + C.Bold + "Time");
-		Scoreboard.Write(UtilTime.convertString(_secondsSinceStart * 1000, 0, TimeUnit.FIT));
-
-		Scoreboard.WriteBlank();
-
-		Scoreboard.Write(C.cYellow + C.Bold + "Tributes");
-		if (team.GetPlayers(true).size() > 7)
-		{
-			Scoreboard.Write("" + team.GetPlayers(true).size());
-		}
-		else
-		{
-			for (Player player : team.GetPlayers(true))
-			{
-				Scoreboard.Write(C.cWhite + player.getName());
-			}
-		}
-
-		Scoreboard.WriteBlank();
-
-		if (_chestRefillTime > 0 && _deathMatchTime > 60)
-		{
-			Scoreboard.Write(C.cGold + C.Bold + "Chest Refill");
-			Scoreboard.Write(UtilTime.convertString(_chestRefillTime * 1000, 0, TimeUnit.FIT));
-		}
-		else if (_deathMatchTime > 0)
-		{
-			Scoreboard.Write(C.cRed + C.Bold + "Deathmatch");
-			Scoreboard.Write(UtilTime.convertString(
-					Math.min(_deathMatchTime, _deathMatchTeleported ? 10 : _deathMatchTime) * 1000, 0, TimeUnit.FIT));
-		}
-		else
-		{
-			Scoreboard.Write(C.cRed + C.Bold + "Game End");
-			Scoreboard.Write(UtilTime.convertString(Math.max(0, _gameEndTime) * 1000, 0, TimeUnit.FIT));
-		}
-
-		Scoreboard.Draw();
-	}
-
 	private void setBorder()
 	{
 		_borderStartedMoving = System.currentTimeMillis();
@@ -2295,4 +2228,30 @@ public class SurvivalGames extends SoloGame
 			}
 		}
 	}
+	
+	public int getSecondsSinceStart() 
+	{
+		return this._secondsSinceStart;
+	}
+	
+	public int getChestRefillTime() 
+	{
+		return this._chestRefillTime;
+	}
+	
+	public int getDeathMatchTime() 
+	{
+		return this._deathMatchTime;
+	}
+	
+	public boolean isDeathMatchTeleported() 
+	{
+		return this._deathMatchTeleported;
+	}
+	
+	public int getGameEndTime() 
+	{
+		return this._gameEndTime;
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
deleted file mode 100644
index 3d2e51099..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
+++ /dev/null
@@ -1,1630 +0,0 @@
-package nautilus.game.arcade.game.games.survivalgames;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.bukkit.*;
-import org.bukkit.FireworkEffect.Type;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.Chest;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Snowball;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.ItemSpawnEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.hanging.HangingBreakEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.util.Vector;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.common.util.MapUtil;
-import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilEvent;
-import mineplex.core.common.util.UtilEvent.ActionType;
-import mineplex.core.common.util.UtilFirework;
-import mineplex.core.common.util.UtilInv;
-import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilParticle.ParticleType;
-import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilTime.TimeUnit;
-import mineplex.core.common.util.UtilWorld;
-import mineplex.core.itemstack.ItemStackFactory;
-import mineplex.core.recharge.Recharge;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.visibility.VisibilityManager;
-import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
-import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.events.GameStateChangeEvent;
-import nautilus.game.arcade.game.Game;
-import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.TeamGame;
-import nautilus.game.arcade.game.games.survivalgames.kit.*;
-import nautilus.game.arcade.kit.Kit;
-
-public class SurvivalGamesTeams extends TeamGame
-{
-	private HashSet<Location> _openedChest = new HashSet<Location>();
-	private ArrayList<ItemStack> _baseChestLoot = new ArrayList<ItemStack>();
-	private ArrayList<ItemStack> _superChestLoot = new ArrayList<ItemStack>();
-
-	//Misc
-	private HashMap<Entity, Player> _tntMap = new HashMap<Entity, Player>();
-	private HashSet<Location> _placedBlocks = new HashSet<Location>();
-	private Location _spawn;
-
-	//Creep
-	private int _maxSpreadRate = 120;
-	private ArrayList<Location> _redLocations = new ArrayList<Location>();
-	private int _spreadType = 0;
-	private String _spreadName = "";
-	private boolean _ignoreLiquids = true;
-	private ArrayList<Entry<Integer, Integer>> _spreadTypeBlocks;
-	private HashMap<Player, Long> _redOutTime = new HashMap<Player, Long>();
-
-	private HashMap<Integer, HashMap<Integer, HashSet<Integer>>> _redMap = new HashMap<Integer, HashMap<Integer, HashSet<Integer>>>();
-	private HashMap<Player, ArrayList<ChunkChange>> _redChunks = new HashMap<Player, ArrayList<ChunkChange>>();
-
-	//Supply Drop
-	private ArrayList<Location> _supplyLocations = new ArrayList<Location>();
-	private Location _supplyCurrent = null;
-	private Location _supplyEffect = null;
-	private ArrayList<Block> _supplyChests = new ArrayList<Block>();
-
-	//Deathmatch
-	private boolean _deathmatchCountdown = false;
-	private boolean _deathmatchLive = false;
-	private long _deathmatchTime = 0;
-
-	//Debug
-	private long totalTime = 0;
-
-	public SurvivalGamesTeams(ArcadeManager manager) 
-	{
-		super(manager, GameType.SurvivalGamesTeams,
-
-				new Kit[]
-						{
-				new KitAxeman(manager),
-				//new KitLooter(manager),
-				new KitKnight(manager),
-
-				new KitArcher(manager),
-				new KitBrawler(manager),
-
-				new KitAssassin(manager),
-				new KitBeastmaster(manager),
-				new KitBomber(manager),
-				//new KitNecromancer(manager),
-				
-				new KitHorseman(manager)
-						},
-
-						new String[]
-								{
-				"Search for chests to find loot",
-				"Slaughter your opponents",
-				"Stay away from the Deep Freeze!",
-				"Last team alive wins!"
-								});
-		
-		_help = new String[] 
-				{
-				C.cGreen + "Use a Compass to find and kill enemies!",
-				C.cAqua + "Crouch to become invisible to Compass tracking!",
-				C.cGreen + "Avoid the Deep Freeze at all costs!",
-				C.cAqua + "Use TNT & Tripwires to make traps!",
-				C.cGreen + "You lose Speed 2 at start of game if you attack.",
-				C.cAqua + "Avoid enemies who have better gear than you!",
-				C.cGreen + "Compass finds Supply Drops during night time.",
-				C.cAqua + "Compass finds Players during day time.",
-				};
-
-		setItemMerge(true);
-//		Manager.GetAntiStack().SetEnabled(false);
-
-		this.GameTimeout = 9600000;
-		
-		this.WorldTimeSet = 0;
-		this.WorldBoundaryKill = false; 
-		
-		this.SpawnDistanceRequirement = 48;
-
-		this.DamageSelf = true;
-		this.DamageTeamSelf = false;
-
-		this.DeathDropItems = true;
-
-		this.ItemDrop = true;
-		this.ItemPickup = true;
-
-		this.CompassEnabled = false; //XXX
-		
-		this.InventoryClick = true;
-		this.InventoryOpenBlock = true;
-		this.InventoryOpenChest = true;
-
-		//Blocks
-		this.BlockBreakAllow.add(46);	//TNT
-		this.BlockPlaceAllow.add(46);
-
-		this.BlockBreakAllow.add(30);	//Web
-		this.BlockPlaceAllow.add(30);
-
-		this.BlockBreakAllow.add(132); 	//Tripwire
-		this.BlockPlaceAllow.add(132);
-
-		this.BlockBreakAllow.add(131);	//Wire Hook
-		this.BlockPlaceAllow.add(131);
-
-		this.BlockBreakAllow.add(55);	//Redstone Dust
-		this.BlockPlaceAllow.add(55);
-
-		this.BlockBreakAllow.add(72);	//Wood Pressure Plate
-		this.BlockPlaceAllow.add(72);
-
-		this.BlockBreakAllow.add(69);	//Lever
-		this.BlockPlaceAllow.add(69);
-
-		this.BlockBreakAllow.add(18);	//Leaves
-
-		//SPREAD
-		_spreadType = 1;//UtilMath.r(3);
-
-		_spreadTypeBlocks = new ArrayList<Entry<Integer, Integer>>();
-
-		if (_spreadType == 0)
-		{
-			_spreadName = "Red";
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(159, 14));
-		}
-		else if (_spreadType == 1)
-		{
-			_spreadName = "Deep Freeze";
-			_ignoreLiquids = false;
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(78, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(79, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(80, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(49, 0));
-		}
-		else if (_spreadType == 2)
-		{
-			_spreadName = "Nether Corruption";
-			_ignoreLiquids = false;
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(49, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(87, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(88, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(89, 0));
-			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(153, 0));
-		}
-
-		System.out.println("===================");
-		System.out.println("CREEP TYPE: " + _spreadName);
-		System.out.println("===================");
-		//Manager.GetStatsManager().addTable(GetName(), "kills", "deaths", "chestsOpened");
-		
-		//Tournament
-		if (Manager.IsTournamentServer())
-			QuitOut = false;
-	}
-
-	@Override
-	public double GetKillsGems(Player killer, Player killed, boolean assist)
-	{
-		return 4;
-	}
-
-	@Override
-	public void ParseData() 
-	{
-		ArrayList<Location> allSpawns = new ArrayList<Location>();
-		for (GameTeam team : GetTeamList())
-			allSpawns.addAll(team.GetSpawns());
-		
-		_spawn = UtilWorld.averageLocation(allSpawns);
-
-		for (Location loc : allSpawns)
-			loc.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(loc, _spawn)));
-
-		CreateChestCraftEnchant();
-
-		_supplyLocations = WorldData.GetDataLocs("WHITE");
-		for (Location loc : _supplyLocations)
-			loc.getBlock().setType(Material.GLASS);
-
-		if (!WorldData.GetCustomLocs("VARS").isEmpty())
-		{
-			_maxSpreadRate = WorldData.GetCustomLocs("VARS").get(0).getBlockX();
-			System.out.println("Spread Rate: " + _maxSpreadRate);
-		}
-	}
-
-	private void CreateChestCraftEnchant() 
-	{
-		ArrayList<Location> chests = WorldData.GetCustomLocs("54");
-
-		System.out.println("Map Chest Locations: " + chests.size());
-
-		//Enchants
-		System.out.println("Enchanting Tables: " + Math.min(5, chests.size()));
-		for (int i=0 ; i<5 && !chests.isEmpty() ; i++)
-		{
-			Location loc = chests.remove(UtilMath.r(chests.size()));		
-			loc.getBlock().setType(Material.ENCHANTMENT_TABLE);
-		}
-
-		//Crafting
-		System.out.println("Crafting Benches: " + Math.min(10, chests.size()));
-		for (int i=0 ; i<10 && !chests.isEmpty() ; i++)
-		{
-			Location loc = chests.remove(UtilMath.r(chests.size()));		
-			loc.getBlock().setType(Material.WORKBENCH);
-		}
-
-		int spawn = 0;
-
-		//Chests
-		System.out.println("Chests: " + Math.min(250, chests.size()));
-		for (int i=0 ; i<250 && !chests.isEmpty() ; i++)
-		{
-			Location loc = chests.remove(UtilMath.r(chests.size()));	
-
-			if (UtilMath.offset2d(loc, _spawn) < 8)
-				spawn++;
-		}
-
-		for (Location loc : chests)
-		{
-			if (spawn < 10 && UtilMath.offset(loc, _spawn) < 8)
-			{
-				spawn++;
-				continue;
-			}
-
-			loc.getBlock().setType(Material.AIR);
-		}
-	}
-
-	@EventHandler
-	public void CreateRandomChests(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Recruit)
-			return;
-
-		HashSet<Material> ignore = new HashSet<Material>();
-
-		ignore.add(Material.LEAVES);
-
-		int xDiff = WorldData.MaxX - WorldData.MinX;
-		int zDiff = WorldData.MaxZ - WorldData.MinZ;
-
-		int done = 0;
-
-		while (done < 40)
-		{
-
-			Block block = UtilBlock.getHighest(WorldData.World, WorldData.MinX + UtilMath.r(xDiff), WorldData.MinZ + UtilMath.r(zDiff), ignore);
-
-			if (!UtilBlock.airFoliage(block) || !UtilBlock.solid(block.getRelative(BlockFace.DOWN)))
-				continue;
-
-			block.setTypeIdAndData(54, (byte)UtilMath.r(4), true);
-			done++;
-		}
-	}
-
-	@EventHandler
-	private void OpenChest(PlayerInteractEvent event)
-	{
-		if (event.isCancelled())
-			return;
-
-		if (event.getClickedBlock() == null)
-			return;
-
-		if (!(event.getClickedBlock().getState() instanceof Chest))
-			return;
-
-		if (GetState() != GameState.Live)
-			return;
-
-		if (_openedChest.contains(event.getClickedBlock().getLocation()))
-			return;
-
-		_openedChest.add(event.getClickedBlock().getLocation());
-
-		Chest chest = (Chest)event.getClickedBlock().getState();
-
-		chest.getBlockInventory().clear();
-
-		int count = 2;
-		if (Math.random() > 0.50)			count++;	
-		if (Math.random() > 0.65)			count++;	
-		if (Math.random() > 0.80)			count++;	
-		if (Math.random() > 0.95)			count++;
-
-		if (UtilMath.offset(chest.getLocation(), _spawn) < 8)
-			count += 3;
-
-		if (GetKit(event.getPlayer()) instanceof KitLooter)
-		{
-			count += UtilMath.r(3);
-		}
-
-		if (_supplyChests.contains(event.getClickedBlock()))
-		{
-			count = 2;	
-			if (Math.random() > 0.75)			count++;
-			if (Math.random() > 0.95)			count++;
-		}
-
-		for (int i = 0; i < count; i++) 
-			chest.getBlockInventory().setItem(UtilMath.r(27), GetChestItem(_supplyChests.contains(event.getClickedBlock())));
-
-		_supplyChests.remove(event.getClickedBlock());
-
-		Bukkit.getPluginManager().callEvent(new SupplyChestOpenEvent(event.getPlayer(), event.getClickedBlock()));
-	}
-
-	private ItemStack GetChestItem(boolean superChest)
-	{
-		if (_baseChestLoot.isEmpty()) 
-		{
-			//Armor
-			for (int i = 0; i < 10; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_HELMET));
-			for (int i = 0; i < 3; i++)				_baseChestLoot.add(new ItemStack(Material.IRON_CHESTPLATE));
-			for (int i = 0; i < 5; i++)				_baseChestLoot.add(new ItemStack(Material.IRON_LEGGINGS));
-			for (int i = 0; i < 10; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_BOOTS));
-
-			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_HELMET));
-			for (int i = 0; i < 20; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_CHESTPLATE));
-			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_LEGGINGS));
-			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_BOOTS));
-
-			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_HELMET));
-			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_CHESTPLATE));
-			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_LEGGINGS));
-			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_BOOTS));
-
-			for (int i = 0; i < 100; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_HELMET));
-			for (int i = 0; i < 90; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_CHESTPLATE));
-			for (int i = 0; i < 85; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_LEGGINGS));
-			for (int i = 0; i < 100; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_BOOTS));
-
-			//Weapons
-			for (int i = 0; i < 70; i++)			_baseChestLoot.add(new ItemStack(Material.WOOD_AXE));
-			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_AXE));
-			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.STONE_AXE));
-			for (int i = 0; i < 15; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_AXE));
-
-			for (int i = 0; i < 60; i++)			_baseChestLoot.add(new ItemStack(Material.WOOD_SWORD));
-			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_SWORD));			
-			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.STONE_SWORD));
-			for (int i = 0; i < 8; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_SWORD));
-
-			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.BOW));
-			for (int i = 0; i < 55; i++)			_baseChestLoot.add(new ItemStack(Material.ARROW, 4));
-
-			for (int i = 0; i < 15; i++)			_baseChestLoot.add(new ItemStack(Material.TNT, 1));
-			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.WEB, 2));
-
-			//Food
-			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.MUSHROOM_SOUP));
-			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.COOKED_CHICKEN, 5));
-			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.RAW_BEEF, 6));
-			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.GRILLED_PORK, 5));
-			for (int i = 0; i < 160; i++)			_baseChestLoot.add(new ItemStack(Material.BREAD, 5));
-			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.PUMPKIN_PIE, 4));
-			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.COOKIE, 7));
-			for (int i = 0; i < 90; i++)			_baseChestLoot.add(new ItemStack(Material.ROTTEN_FLESH, 4));
-
-			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.WHEAT, 6));
-
-			//Misc
-			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.COMPASS, 1));
-			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.EXP_BOTTLE, 1));
-			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_INGOT, 2));
-			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_INGOT));
-			for (int i = 0; i < 5; i++)				_baseChestLoot.add(new ItemStack(Material.DIAMOND));
-			for (int i = 0; i < 60; i++)			_baseChestLoot.add(new ItemStack(Material.STICK, 4));
-			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.FLINT, 6));
-			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.FEATHER, 6));
-			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.BOAT));
-			for (int i = 0; i < 70; i++)			_baseChestLoot.add(new ItemStack(Material.FISHING_ROD));
-
-			//Building Supplies
-			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.PISTON_BASE, 4));
-
-			/*
-			String material = _baseChestLoot.get(0).getType().toString();
-			double count = 0;
-
-			for (int i = 0; i < _baseChestLoot.size(); i++)
-			{
-				if (!_baseChestLoot.get(i).getType().toString().equalsIgnoreCase(material))
-				{
-					System.out.println(material + " - " + count + " - " + (count / _baseChestLoot.size() * 100) + "%");
-					material = _baseChestLoot.get(i).getType().toString();
-					count = 1;
-				}
-				else
-				{
-					count++;
-				}
-			}
-
-			System.out.println(material + " " + (count / _baseChestLoot.size() * 100) + "%");
-			 */
-		}
-
-		if (_superChestLoot.isEmpty()) 
-		{
-			for (int i = 0; i < 3; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_HELMET));
-			for (int i = 0; i < 1; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_CHESTPLATE));
-			for (int i = 0; i < 2; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_LEGGINGS));
-			for (int i = 0; i < 3; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_BOOTS));
-
-			for (int i = 0; i < 30; i++)			_superChestLoot.add(new ItemStack(Material.IRON_HELMET));
-			for (int i = 0; i < 24; i++)			_superChestLoot.add(new ItemStack(Material.IRON_CHESTPLATE));
-			for (int i = 0; i < 27; i++)			_superChestLoot.add(new ItemStack(Material.IRON_LEGGINGS));
-			for (int i = 0; i < 30; i++)			_superChestLoot.add(new ItemStack(Material.IRON_BOOTS));
-
-			for (int i = 0; i < 24; i++)			_superChestLoot.add(new ItemStack(Material.IRON_SWORD));
-			for (int i = 0; i < 8; i++)			_superChestLoot.add(new ItemStack(Material.DIAMOND_SWORD));
-			for (int i = 0; i < 16; i++)			_superChestLoot.add(new ItemStack(Material.DIAMOND_AXE));
-		}
-
-
-		ItemStack stack = _baseChestLoot.get(UtilMath.r(_baseChestLoot.size()));
-		if (superChest)		
-			stack = _superChestLoot.get(UtilMath.r(_superChestLoot.size()));
-
-		int amount = 1;
-
-		if (stack.getType().getMaxStackSize() > 1)
-			amount = Math.max(1, UtilMath.r(stack.getAmount()));
-
-		if (stack.getTypeId() == 33)
-			return ItemStackFactory.Instance.CreateStack(stack.getTypeId(), (byte)0, amount, "Barricade");
-
-		return ItemStackFactory.Instance.CreateStack(stack.getTypeId(), amount);
-	}
-
-	@EventHandler
-	public void StartEffectApply(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Live)
-			return;
-
-		for (Player player : GetPlayers(true))
-		{
-			Manager.GetCondition().Factory().Speed("Start Speed", player, player, 30, 1, false, false, false);
-			Manager.GetCondition().Factory().HealthBoost("Start Health", player, player, 30, 1, false, false, false);
-
-			player.setHealth(player.getMaxHealth());
-		}
-	}
-
-	@EventHandler
-	public void SpeedRemove(CustomDamageEvent event)
-	{
-		Player damager = event.GetDamagerPlayer(true);
-		if (damager != null)
-			Manager.GetCondition().EndCondition(damager, null, "Start Speed");
-	}
-
-	//If an item spawns and no one is there to see it, does it really spawn? No.
-	@EventHandler
-	public void ItemSpawn(ItemSpawnEvent event)
-	{
-		for (Player player : GetPlayers(true))
-			if (UtilMath.offset(player, event.getEntity()) < 6)
-				return;
-
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void RedBorderStart(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Prepare)
-			return;
-
-		//Start Red
-		Block block;
-
-		for (int x=WorldData.MinX ; x<=WorldData.MaxX ; x++)
-		{
-			block = WorldData.World.getHighestBlockAt(x, WorldData.MinZ);
-			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
-				block = block.getRelative(BlockFace.DOWN);
-			if (block.getY() > 0)
-				_redLocations.add(block.getLocation());
-
-			block = WorldData.World.getHighestBlockAt(x, WorldData.MaxZ);
-			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
-				block = block.getRelative(BlockFace.DOWN);
-			if (block.getY() > 0)
-				_redLocations.add(block.getLocation());
-		}
-
-		for (int z=WorldData.MinZ ; z<=WorldData.MaxZ ; z++)
-		{
-			block = WorldData.World.getHighestBlockAt(WorldData.MinX, z);
-			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
-				block = block.getRelative(BlockFace.DOWN);
-			if (block.getY() > 0)
-				_redLocations.add(block.getLocation());
-
-			block = WorldData.World.getHighestBlockAt(WorldData.MaxX, z);
-			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
-				block = block.getRelative(BlockFace.DOWN);
-			if (block.getY() > 0)
-				_redLocations.add(block.getLocation());
-		}
-	}
-
-	public int RedMax()
-	{
-		return _maxSpreadRate;// + (24 - GetPlayers(true).size())*2;
-	}
-
-	@EventHandler
-	public void RedUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.TICK)
-			return;
-
-		if (!IsLive())
-			return;
-
-		long time = System.currentTimeMillis();
-
-		if (_redLocations.isEmpty())
-			return;
-
-		int max = Math.max(5, Math.min(RedMax(), _redLocations.size()/100));
-
-		for (int i=0 ; i<max ; i++)
-		{
-			if (_redLocations.isEmpty())
-				break;
-
-			Location loc = _redLocations.remove(UtilMath.r(_redLocations.size()));
-
-			//Already Red
-			if (IsRed(loc.getBlock()))
-			{
-				i = Math.max(0, i-1);
-				continue;
-			}
-
-			//Set to Red
-			SetRed(loc);
-
-			//Spread to Neighbours
-			Block block = loc.getBlock();
-
-			RedSpread(block.getRelative(BlockFace.UP));
-			RedSpread(block.getRelative(BlockFace.DOWN));
-
-			if (!RedSpread(block.getRelative(BlockFace.NORTH)))
-			{
-				RedSpread(block.getRelative(BlockFace.NORTH).getRelative(BlockFace.UP));
-				RedSpread(block.getRelative(BlockFace.NORTH).getRelative(BlockFace.DOWN));
-			}
-
-			if (!RedSpread(block.getRelative(BlockFace.EAST)))
-			{
-				RedSpread(block.getRelative(BlockFace.EAST).getRelative(BlockFace.UP));
-				RedSpread(block.getRelative(BlockFace.EAST).getRelative(BlockFace.DOWN));
-			}
-
-			if (!RedSpread(block.getRelative(BlockFace.SOUTH)))
-			{
-				RedSpread(block.getRelative(BlockFace.SOUTH).getRelative(BlockFace.UP));
-				RedSpread(block.getRelative(BlockFace.SOUTH).getRelative(BlockFace.DOWN));
-			}
-
-			if (!RedSpread(block.getRelative(BlockFace.WEST)))
-			{
-				RedSpread(block.getRelative(BlockFace.WEST).getRelative(BlockFace.UP));
-				RedSpread(block.getRelative(BlockFace.WEST).getRelative(BlockFace.DOWN));
-			}
-		}
-
-		totalTime += System.currentTimeMillis() - time;
-	}
-
-	@EventHandler
-	public void RedTimer(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.MIN_01)
-			return;
-
-		if (!IsLive())
-			return;
-
-		System.out.println(" ");
-		System.out.println("Game Time: " + UtilTime.MakeStr(System.currentTimeMillis() - this.GetStateTime()));
-		System.out.println("Creep Size: " + _redLocations.size());
-		System.out.println("Creep Time: " + UtilTime.convertString(totalTime, 4, TimeUnit.SECONDS));
-		System.out.println(" ");
-
-		totalTime = 0;
-	}
-
-	public boolean RedSpread(Block block)
-	{
-		if (block == null || block.getType() == Material.AIR)
-			return false;
-
-		//Inside Boundary
-		if (UtilMath.offset(_spawn, block.getLocation()) < 48)
-			return false;
-
-		//Liquid
-		if (block.isLiquid())
-		{
-			if (_ignoreLiquids)
-				return false;
-
-			//Only freeze surface water
-			boolean surroundedByWater = true;
-			for (Block other : UtilBlock.getSurrounding(block, false))
-			{
-				if (other.getY() < block.getY())
-					continue;
-
-				if (!other.isLiquid() && !IsRed(other))
-				{
-					surroundedByWater = false;
-					break;
-				}
-			}
-			if (surroundedByWater)
-				return false;
-
-			//Dont Spread to Moving
-			if (block.getTypeId() == 9)
-				if (block.getData() != 0)
-					return false;
-
-			//Dont spread near moving
-			for (Block other : UtilBlock.getSurrounding(block, false))
-			{
-				if (other.getTypeId() == 9 && other.getData() != 0)
-				{
-					return false;
-				}
-			}
-		}
-
-		//Ignore Signs
-		if (block.getType() == Material.SIGN || block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)
-			return false;
-
-		//Pre-Red
-		if (IsRed(block))
-		{
-			return false;
-		}
-
-		if ((!UtilBlock.solid(block) || UtilBlock.airFoliage(block) || block.getType() == Material.CHEST))
-		{
-			if (!block.isLiquid())
-			{
-				while (block.getType() == Material.VINE)
-				{
-					RedChangeBlock(block.getLocation(), 0, (byte)0);
-					block = block.getRelative(BlockFace.DOWN);
-				}
-
-				//Remove Foliage
-				if (block.getType() != Material.AIR)
-					RedChangeBlock(block.getLocation(), 0, (byte)0);
-
-				return false;
-			}
-		}
-
-		//Outside Boundaries
-		if (block.getX() < WorldData.MinX || block.getX() > WorldData.MaxX || block.getZ() < WorldData.MinZ || block.getZ() > WorldData.MaxZ)	
-			return false;
-
-		//Not Visible
-		if (!UtilBlock.isVisible(block))
-			return false;
-
-		//Apply
-		_redLocations.add(block.getLocation());
-		return true;
-	}
-
-	public void RedChangeBlock(Location loc, int id, byte data)
-	{
-		if (!IsLive())
-			return;
-
-		MapUtil.ChunkBlockChange(loc, id, data, false);
-
-		//Old Style
-		/*
-		if (true)
-		{
-			for (Player player : UtilServer.getPlayers())
-			{
-				if (Math.abs(player.getLocation().getChunk().getX() - loc.getChunk().getX()) > UtilServer.getServer().getViewDistance())
-					continue;
-
-				if (Math.abs(player.getLocation().getChunk().getZ() - loc.getChunk().getZ()) > UtilServer.getServer().getViewDistance())
-					continue;
-
-				player.sendBlockChange(loc, id, data);
-			}
-
-			return;
-		}
-		 */
-
-		//Non-Queue
-		for (Player player : UtilServer.getPlayers())
-		{
-			if (Math.abs(player.getLocation().getChunk().getX() - loc.getChunk().getX()) > UtilServer.getServer().getViewDistance())
-				continue;
-
-			if (Math.abs(player.getLocation().getChunk().getZ() - loc.getChunk().getZ()) > UtilServer.getServer().getViewDistance())
-				continue;
-
-			if (!_redChunks.containsKey(player))
-				_redChunks.put(player, new ArrayList<ChunkChange>());
-
-			boolean added = false;
-			for (ChunkChange change : _redChunks.get(player))
-			{
-				if (change.Chunk.equals(loc.getChunk()))// && change.DirtyCount < 63)
-				{
-					change.AddChange(loc, id, data);
-					added = true;
-					break;
-				}
-			}
-			if (!added)
-				_redChunks.get(player).add(new ChunkChange(loc, id, data));
-		}
-	}
-
-	@EventHandler
-	public void RedChunkUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FAST)
-			return;
-
-		if (!IsLive())
-			return;
-
-		for (Player player : _redChunks.keySet())
-		{
-			//Remove Far Away
-			Iterator<ChunkChange> chunkIterator = _redChunks.get(player).iterator();
-			while (chunkIterator.hasNext())
-			{
-				ChunkChange change = chunkIterator.next();
-
-				if (Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX()) > UtilServer.getServer().getViewDistance() ||
-						Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ()) > UtilServer.getServer().getViewDistance())
-				{
-					chunkIterator.remove();
-				}
-			}
-
-			if (_redChunks.get(player).isEmpty())
-				continue;
-
-			//Get Fittest Chunk to Update
-			int bestId = -1;
-			double bestScore = 0;
-
-			for (int i=0 ; i<_redChunks.get(player).size() ; i++)
-			{
-				ChunkChange change = _redChunks.get(player).get(i);
-
-				//Base Score, 1 per block
-				double score = change.Changes.size();
-
-				//Time Score, multiply block score by 1 + 0.5 per second
-				score = score * (1 + (System.currentTimeMillis() - change.Time)/200d);
-
-				//Distance Divisor
-				double dist = 0.5;
-				if (!player.getLocation().getChunk().equals(change.Chunk))
-				{
-					int x = Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX());
-					int z = Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ());
-					dist = Math.sqrt(x*x + z*z);
-				}
-				score = score/(dist*dist);
-
-				if (bestId == -1 || score > bestScore)
-				{
-					bestId = i;
-					bestScore = score;
-				}
-			}
-
-			if (bestId == -1)
-				continue;
-
-			//Send MultiBlock or Chunk Update for Fittest Chunk
-			ChunkChange change = _redChunks.get(player).remove(bestId);
-
-			if (change.DirtyCount > 63)
-				MapUtil.SendChunkForPlayer(change.Chunk.getX(), change.Chunk.getZ(), player);
-			else
-				MapUtil.SendMultiBlockForPlayer(change.Chunk.getX(), change.Chunk.getZ(), change.DirtyBlocks, change.DirtyCount, change.Chunk.getWorld(), player);
-		}
-	}
-
-	public boolean IsRed(Block block)
-	{
-		if (!_redMap.containsKey(block.getX()))
-			return false;
-
-		if (!_redMap.get(block.getX()).containsKey(block.getY()))
-			return false;
-
-		return _redMap.get(block.getX()).get(block.getY()).contains(block.getZ());
-	}
-
-	public void SetRed(Location loc)
-	{
-		//Save Red
-		if (!_redMap.containsKey(loc.getBlockX()))
-			_redMap.put(loc.getBlockX(), new HashMap<Integer, HashSet<Integer>>());
-
-		if (!_redMap.get(loc.getBlockX()).containsKey(loc.getBlockY()))
-			_redMap.get(loc.getBlockX()).put(loc.getBlockY(), new HashSet<Integer>());
-
-		_redMap.get(loc.getBlockX()).get(loc.getBlockY()).add(loc.getBlockZ());
-
-		//Red
-		if (_spreadType == 0)
-		{
-			RedChangeBlock(loc, 159, (byte)14);
-		}
-		//Snow
-		else if (_spreadType == 1)
-		{
-			if (loc.getBlock().getType() == Material.LEAVES)									//RedChangeBlock(loc, 79, (byte)0);							
-			{
-
-			}
-			else if (loc.getBlock().getTypeId() == 8 || loc.getBlock().getTypeId() == 9)		RedChangeBlock(loc, 79, (byte)0);
-			else if (loc.getBlock().getTypeId() == 10 || loc.getBlock().getTypeId() == 11)		RedChangeBlock(loc, 49, (byte)0);
-			else																				RedChangeBlock(loc, 80, (byte)0);
-		}
-		//Nether
-		else 
-		{
-			if (loc.getBlock().getType() == Material.LEAVES)									RedChangeBlock(loc, 88, (byte)0);
-			else if (loc.getBlock().getTypeId() == 8 || loc.getBlock().getTypeId() == 9)		RedChangeBlock(loc, 49, (byte)0);
-			else
-			{
-				double r = Math.random();
-				if (r > 0.1)			RedChangeBlock(loc, 87, (byte)0);
-				else					RedChangeBlock(loc, 153, (byte)0);
-			}	
-		}
-	}
-
-	@EventHandler
-	public void RedAttack(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.FASTER)
-			return;
-
-		for (Player player : GetPlayers(true))
-		{
-			boolean near = false;
-
-			for (Block block : UtilBlock.getInRadius(player.getLocation(), 5d).keySet())
-			{
-				if (!IsRed(block))
-					continue;
-
-				near = true;
-
-				//Red
-				if (_spreadType == 0)
-				{
-					if (block.getRelative(BlockFace.UP).getType() == Material.AIR)
-					{
-						block.getRelative(BlockFace.UP).setType(Material.FIRE);
-						break;
-					}
-				}
-
-				//Snow
-				else if (_spreadType == 1)
-				{
-					if (Math.random() > 0.95)
-						player.playEffect(block.getLocation().add(0, 1, 0), Effect.STEP_SOUND, Material.SNOW_BLOCK);
-
-					if (Math.random() > 0.8)
-					{			
-						Vector traj = UtilAlg.getTrajectory(block.getLocation().add(0.5, 1.5, 0.5), player.getLocation());
-
-						Snowball ball = player.getWorld().spawn(block.getLocation().add(0.5, 1.5, 0.5).subtract(traj.clone().multiply(8 + UtilMath.r(8))), Snowball.class);	
-
-						ball.setVelocity(UtilAlg.getTrajectory(ball.getLocation(), player.getEyeLocation().add(0, 3, 0)).add(new Vector(Math.random()-0.5, Math.random()-0.5, Math.random()-0.5).multiply(0.1)));
-					}	
-				}
-
-				//Nether
-				if (_spreadType == 2)
-				{
-					if (block.getRelative(BlockFace.UP).getType() == Material.AIR)
-					{
-						block.getRelative(BlockFace.UP).setType(Material.FIRE);
-						break;
-					}
-				}
-			}
-
-			if (!near)
-			{
-				if (!UtilEnt.isGrounded(player))
-				{
-					Block block = player.getLocation().getBlock();
-
-					while (!UtilBlock.solid(block) && block.getY() > 0)
-						block = block.getRelative(BlockFace.DOWN);
-
-					if (IsRed(block) || block.getY() == 0)
-						near = true;
-				}
-			}
-
-			if (!near)
-			{
-				if (_deathmatchLive && UtilMath.offset(player.getLocation(), _spawn) > 48)
-					near = true;
-			}
-
-			if (near)
-			{
-				player.getWorld().playSound(player.getLocation(), Sound.AMBIENCE_RAIN, 0.5f, 0f);
-
-				if (!_redOutTime.containsKey(player))
-				{
-					_redOutTime.put(player, System.currentTimeMillis());
-				} 
-				else
-				{
-					if (UtilTime.elapsed(_redOutTime.get(player), 5000))
-					{ 
-						Manager.GetDamage().NewDamageEvent(player, null, null, 
-								DamageCause.VOID, 1, false, true, false,
-								"Hunger Games", _spreadName);	
-					}
-				}
-			}
-			else
-			{
-				_redOutTime.remove(player);
-			}
-		}
-	}
-
-	@EventHandler
-	public void RedDamage(CustomDamageEvent event)
-	{
-		if (event.GetProjectile() == null)
-			return;
-
-		if (!(event.GetProjectile() instanceof Snowball))
-			return;
-
-		event.AddMod("Snowball", _spreadName, 2, true);
-
-		event.AddKnockback("Snowball", 4);
-	}
-
-	@EventHandler
-	public void DayNightCycle(UpdateEvent event)
-	{
-		if (!IsLive())
-			return;
-
-		if (event.getType() != UpdateType.TICK)
-			return;
-
-		long time = WorldData.World.getTime();
-
-		if (time > 22000 || time < 14000)
-		{
-			WorldTimeSet = (WorldTimeSet + 4)%24000;
-		}
-		else
-		{
-			WorldTimeSet = (WorldTimeSet + 16)%24000;
-		}
-
-		WorldData.World.setTime(WorldTimeSet);
-	}
-
-	@EventHandler
-	public void SupplyDrop(UpdateEvent event)
-	{
-		if (!IsLive())
-			return;
-
-		if (event.getType() != UpdateType.FASTEST)
-			return;
-
-		long time = WorldData.World.getTime();
-
-		if (time > 14000 && time < 23000)
-		{
-			if (_supplyCurrent == null && !_deathmatchCountdown && !_deathmatchLive)
-			{
-				if (_supplyLocations.isEmpty())
-					return;
-
-				_supplyCurrent = _supplyLocations.remove(UtilMath.r(_supplyLocations.size()));
-
-				//Remove Prior
-				_supplyChests.remove(_supplyCurrent.getBlock().getRelative(BlockFace.UP));
-				_supplyCurrent.getBlock().getRelative(BlockFace.UP).setType(Material.AIR);
-
-				//Create New
-				_supplyCurrent.getBlock().setType(Material.BEACON);
-				for (int x=-1 ; x<=1 ; x++)
-					for (int z=-1 ; z<=1 ; z++)
-						_supplyCurrent.getBlock().getRelative(x, -1, z).setType(Material.IRON_BLOCK);
-
-				//Announce
-				this.Announce(C.cYellow + C.Bold + "Supply Drop Incoming (" + ChatColor.RESET + UtilWorld.locToStrClean(_supplyCurrent) + C.cYellow + C.Bold + ")");
-			}
-		}
-		else
-		{
-			if (_supplyCurrent != null)
-			{
-				if (_supplyEffect == null)
-				{
-					_supplyEffect = _supplyCurrent.clone();
-					_supplyEffect.setY(250);
-				}
-
-				FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(Color.YELLOW).with(Type.BURST).trail(false).build();
-				UtilFirework.playFirework(_supplyEffect, effect);
-
-				_supplyEffect.setY(_supplyEffect.getY()-2);
-
-				if (UtilMath.offset(_supplyEffect, _supplyCurrent) < 2)
-				{
-					effect = FireworkEffect.builder().flicker(false).withColor(Color.YELLOW).with(Type.BALL_LARGE).trail(true).build();
-					UtilFirework.playFirework(_supplyEffect, effect);
-
-					//Create Chest
-					_supplyCurrent.getBlock().setType(Material.GLASS);
-					_supplyCurrent.getBlock().getRelative(BlockFace.UP).setType(Material.CHEST);
-					_supplyChests.add(_supplyCurrent.getBlock().getRelative(BlockFace.UP));
-					_openedChest.remove(_supplyCurrent);
-
-					//Reset
-					_supplyEffect = null;
-					_supplyCurrent = null;
-				}
-			}
-		}
-	}
-
-	@EventHandler
-	public void SupplyGlow(UpdateEvent event)
-	{
-		if (!IsLive())
-			return;
-
-		if (event.getType() != UpdateType.TICK)
-			return;
-
-		if (_supplyChests.isEmpty())
-			return;
-
-		Iterator<Block> chestIterator = _supplyChests.iterator();
-
-		while (chestIterator.hasNext())
-		{
-			Block block = chestIterator.next();
-
-			if (block.getType() != Material.CHEST)
-			{
-				chestIterator.remove();
-				continue;
-			}
-
-			UtilParticle.PlayParticle(ParticleType.SPELL, block.getLocation().add(0.5, 0.5, 0.5), 0.3f, 0.3f, 0.3f, 0, 1,
-					ViewDist.LONG, UtilServer.getPlayers());
-		}
-	}
-
-	@EventHandler
-	public void DeathmatchUpdate(UpdateEvent event)
-	{
-		if (!IsLive())
-			return;
-
-		if (_deathmatchLive)
-		{
-			if (event.getType() != UpdateType.SEC)
-				return;
-
-			if (_deathmatchTime <= 0)
-				return;
-
-			for (Player player : GetPlayers(true))
-				VisibilityManager.Instance.refreshPlayerToAll(player);
-
-			Announce(C.cRed + C.Bold + "Deathmatch in " + _deathmatchTime + "...");
-			_deathmatchTime--;
-		}
-
-		else if (_deathmatchCountdown)
-		{
-			if (event.getType() != UpdateType.TICK)
-				return;
-
-			long timeLeft = 60000 - (System.currentTimeMillis() - _deathmatchTime);
-
-			if (timeLeft <= 0)
-			{ 
-				_deathmatchLive = true;
-
-				for (GameTeam team : GetTeamList())
-					team.SpawnTeleport();
-
-				_redLocations.clear();
-
-				for (Block block : UtilBlock.getInRadius(_spawn, 52d).keySet())
-					RedSpread(block);
-
-				_deathmatchTime = 10;
-			}	 
-		}
-		else
-		{
-			if (event.getType() != UpdateType.SEC)
-				return;
-
-			if (!UtilTime.elapsed(GetStateTime(), 360000))
-				return;
-
-			if (GetPlayers(true).size() > 4)
-				return;
-
-			if (!UtilTime.elapsed(_deathmatchTime, 60000))
-				return;
-
-			Announce(C.cGreen + C.Bold + "Type " + ChatColor.RESET + C.Bold + "/dm" + C.cGreen + C.Bold + " to start Deathmatch!");
-
-			_deathmatchTime = System.currentTimeMillis();
-		}
-	}
-
-	@EventHandler
-	public void DeathmatchMoveCancel(PlayerMoveEvent event)
-	{
-		if (!_deathmatchLive)
-			return;
-
-		if (_deathmatchTime <= 0)
-			return;
-
-		if (UtilMath.offset2d(event.getFrom(), event.getTo()) == 0)
-			return;
-
-		if (!IsAlive(event.getPlayer()))
-			return;
-
-		event.setTo(event.getFrom());
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void DeathmatchDamage(CustomDamageEvent event)
-	{
-		if (!_deathmatchLive)
-			return;
-
-		if (_deathmatchTime <= 0)
-			return;
-
-		event.SetCancelled("Deathmatch");
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void DeathmatchStart(PlayerCommandPreprocessEvent event)
-	{
-		if (!event.getMessage().equalsIgnoreCase("/dm"))
-			return;
-		
-		event.setCancelled(true);
-		
-		if (!IsAlive(event.getPlayer()))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Game", "You are not in the game."));
-			return;
-		}
-
-		if (!IsLive())
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
-			return;
-		}
-
-		if (!UtilTime.elapsed(GetStateTime(), 360000))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
-			return;
-		}
-
-		if (GetPlayers(true).size() > 4)
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
-			return;
-		}
-
-		if (_deathmatchCountdown)
-		{
-			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
-			return;
-		}
-
-		_deathmatchCountdown = true;
-
-		Announce(C.cGreen + C.Bold + event.getPlayer().getName() + " has initiated Deathmatch!");
-		Announce(C.cGreen + C.Bold + "Deathmatch starting in 60 seconds...");
-		_deathmatchTime = System.currentTimeMillis();
-
-		for (Player player : UtilServer.getPlayers())
-			player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1f, 1f);
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void CropTrample(PlayerInteractEvent event)
-	{
-		if (event.getAction() != Action.PHYSICAL)
-			return;
-
-		if (event.getPlayer().getLocation().getBlock().getRelative(BlockFace.DOWN).getType() != Material.SOIL)
-			return;
-
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void CompassUpdate(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.SEC)
-			return;
-
-		if (!IsLive())
-			return;
-
-		//Night Time > Drop Target
-		if (WorldData.World.getTime() > 14000 && WorldData.World.getTime() < 23000 && _supplyCurrent != null)
-		{
-			for (Player player : GetPlayers(true))
-			{
-				player.setCompassTarget(_supplyCurrent);
-
-				for (int i : player.getInventory().all(Material.COMPASS).keySet()) 
-				{
-					ItemStack stack = player.getInventory().getItem(i);
-
-					ItemMeta itemMeta = stack.getItemMeta();
-					itemMeta.setDisplayName(
-							C.cWhite + C.Bold + "Supply Drop Location: " +  C.cYellow + UtilMath.trim(1, UtilMath.offset(player.getLocation(), _supplyCurrent)));
-					stack.setItemMeta(itemMeta);
-
-					player.getInventory().setItem(i, stack);
-				}
-			}
-		}
-		//Player Target
-		else
-		{
-			for (Player player : GetPlayers(true))
-			{	
-				Player target = null;
-				double bestDist = 0;
-
-				for (Player other : Manager.GetGame().GetPlayers(true))
-				{
-					if (other.equals(player))
-						continue;
-
-					if (other.isSneaking())
-						continue;
-					
-					if (GetTeam(player).equals(GetTeam(other)))
-						continue;
-
-					double dist = UtilMath.offset(player, other);
-
-					if (target == null || dist < bestDist)
-					{
-						target = other;
-						bestDist = dist;
-					}
-				}
-
-				if (target != null)
-				{
-					player.setCompassTarget(target.getLocation());
-
-					for (int i : player.getInventory().all(Material.COMPASS).keySet()) 
-					{
-						ItemStack stack = player.getInventory().getItem(i);
-
-						ItemMeta itemMeta = stack.getItemMeta();
-						itemMeta.setDisplayName(
-								"    " + C.cWhite + C.Bold + "Nearest Player: " + GetTeam(target).GetColor() + target.getName() + 
-								"    " + C.cWhite + C.Bold + "Distance: " + GetTeam(target).GetColor() + UtilMath.trim(1, bestDist));
-						stack.setItemMeta(itemMeta);
-
-						player.getInventory().setItem(i, stack);
-					}
-				}
-			}
-		}	
-	}		
-
-	@EventHandler
-	public void DisallowBrewFurnace(PlayerInteractEvent event)
-	{
-		if (event.getClickedBlock() == null)
-			return;
-
-		if (event.getClickedBlock().getType() == Material.BREWING_STAND ||
-			event.getClickedBlock().getType() == Material.FURNACE || 
-			event.getClickedBlock().getType() == Material.BURNING_FURNACE)
-			event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void CancelItemFrameBreak(HangingBreakEvent event)
-	{
-		if (event.getEntity() instanceof ItemFrame)
-		{
-			event.setCancelled(true);
-		}
-	}
-
-	@EventHandler
-	public void TNTDelay(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Live)
-			return;
-
-		for (Player player : UtilServer.getPlayers())
-			Recharge.Instance.useForce(player, "Throw TNT", 30000);
-	}
-
-	@EventHandler
-	public void TNTThrow(PlayerInteractEvent event)
-	{
-		if (!IsLive())
-			return;
-
-		if (!UtilEvent.isAction(event, ActionType.L))
-			return;
-
-		Player player = event.getPlayer();
-
-		if (!UtilInv.IsItem(player.getItemInHand(), Material.TNT, (byte)0))
-			return;
-
-		event.setCancelled(true);
-
-		if (!Recharge.Instance.use(player, "Throw TNT", 0, true, false))
-		{
-			UtilPlayer.message(event.getPlayer(), F.main(GetName(), "You cannot use " + F.item("Throw TNT") + " yet."));
-			return;
-		}
-
-		if (!Manager.GetGame().CanThrowTNT(player.getLocation()))
-		{
-			//Inform
-			UtilPlayer.message(event.getPlayer(), F.main(GetName(), "You cannot use " + F.item("Throw TNT") + " here."));
-			return;
-		}
-
-		UtilInv.remove(player, Material.TNT, (byte)0, 1);
-		UtilInv.Update(player);
-
-		TNTPrimed tnt = player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
-
-		UtilAction.velocity(tnt, player.getLocation().getDirection(), 0.5, false, 0, 0.1, 10, false);
-
-		_tntMap.put(tnt, player);
-	}
-
-	@EventHandler
-	public void TNTExplosion(ExplosionPrimeEvent event)
-	{
-		if (!_tntMap.containsKey(event.getEntity()))
-			return;
-
-		Player player = _tntMap.remove(event.getEntity());
-
-		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
-			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, player, 50, 0.1, false, false);
-	}
-
-	@EventHandler
-	public void BlockPlace(BlockPlaceEvent event)
-	{	
-		if (IsRed(event.getBlockAgainst()))
-		{
-			event.setCancelled(true);
-			return;
-		}
-
-		if (event.getItemInHand().getType() == Material.PISTON_BASE)
-		{
-			_placedBlocks.add(event.getBlock().getLocation());
-			event.setCancelled(false);
-
-			final Block block = event.getBlock();
-
-			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
-			{
-				public void run()
-				{
-					block.setType(Material.PISTON_BASE);
-					block.setData((byte) 6);
-				}
-			}, 0);
-		}
-	}
-
-	//@EventHandler
-    public void TourneyKills(CombatDeathEvent event)
-    {
-	    if (!(event.GetEvent().getEntity() instanceof Player))
-            return;
-	   
-	    Player killed = (Player)event.GetEvent().getEntity();
-	
-	    if (event.GetLog().GetKiller() != null)
-	    {
-            Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
-
-            if (killer != null && !killer.equals(killed))
-            {
-            	//Manager.GetStatsManager().addStat(killer, GetName(), "kills", 1);
-	        }
-	    }
-	    
-	    if (event.GetLog().GetPlayer() != null)
-	    {
-            if (killed != null)
-            {
-            	//Manager.GetStatsManager().addStat(killed, GetName(), "deaths", 1);
-	        }
-	    }
-    }
-	
-	@EventHandler
-	public void BlockBreak(BlockBreakEvent event)
-	{
-		if (_placedBlocks.remove(event.getBlock().getLocation()))
-		{
-			event.getBlock().getWorld().playEffect(event.getBlock().getLocation(), Effect.STEP_SOUND, event.getBlock().getType());
-			event.getBlock().setType(Material.AIR);
-		}
-	}
-
-	@EventHandler
-	public void BlockBurn(BlockBurnEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void BlockSpread(BlockSpreadEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void BlockFade(BlockFadeEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void BlockDecay(LeavesDecayEvent event)
-	{
-		event.setCancelled(true);
-	}
-
-	@EventHandler
-	public void PlayerKillAward(CombatDeathEvent event)
-	{
-		Game game = Manager.GetGame();
-		if (game == null)	return;
-
-		if (!(event.GetEvent().getEntity() instanceof Player))
-			return;
-
-		FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(Color.RED).with(Type.BALL_LARGE).trail(false).build();
-		for (int i=0 ; i<3 ; i++)
-			UtilFirework.launchFirework(event.GetEvent().getEntity().getLocation(), effect, null, 3);
-
-		if (event.GetLog().GetKiller() == null)
-			return;
-
-		Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
-		if (killer == null)
-			return;
-
-		if (killer.equals(event.GetEvent().getEntity()))
-			return;
-
-		killer.giveExpLevels(1);
-	}
-
-	@EventHandler
-	public void DisableDamageLevel(CustomDamageEvent event)
-	{
-		event.SetDamageToLevel(false);
-	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void ExplosionDamageRemove(EntityExplodeEvent event)
-	{
-		event.blockList().clear();
-	}
-
-	@EventHandler
-	public void FixClean(PlayerQuitEvent event)
-	{
-		_redChunks.remove(event.getPlayer());
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
new file mode 100644
index 000000000..ec709081f
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -0,0 +1,214 @@
+package nautilus.game.arcade.game.games.survivalgames;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.GameTeam;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class TeamSurvivalGames extends SurvivalGames
+{
+
+	public boolean ForceTeamSize = true;
+	public int PlayersPerTeam = 2;
+	public int TeamCount = 0;
+
+	public TeamSurvivalGames(ArcadeManager manager) 
+	{
+		super(manager, GameType.SurvivalGamesTeams,
+						new String[]
+								{
+				"Search for chests to find loot",
+				"Slaughter your opponents",
+				"Stay away from the Deep Freeze!",
+				"Last team alive wins!"
+								});
+		
+		this.PlayersPerTeam = 2;
+		
+	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event) 
+	{	
+		if (event.GetState() != GameState.Recruit)
+			return;
+		
+		ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
+		this.GetTeamList().clear();
+		
+		TeamColors color = TeamColors.DARK_AQUA;
+		
+		if(!this.ForceTeamSize) 
+		{
+			for(int i = 1; i <= this.TeamCount; i++)
+			{
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+		else 
+		{
+			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
+			{
+				System.out.println("Test");
+				color = getNextColor(color);
+				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				team.SetVisible(true);
+				GetTeamList().add(team);
+			}
+		}
+	}
+	
+	private enum TeamColors
+	{
+	
+		YELLOW(ChatColor.YELLOW),
+		GREEN(ChatColor.GREEN),
+		AQUA(ChatColor.AQUA),
+		DARK_RED(ChatColor.DARK_RED),
+		GOLD(ChatColor.GOLD),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
+		DARK_BLUE(ChatColor.DARK_BLUE),
+		WHITE(ChatColor.WHITE),
+		BLUE(ChatColor.BLUE),
+		DARK_GREEN(ChatColor.DARK_GREEN),
+		DARK_PURPLE(ChatColor.DARK_PURPLE),
+		DARK_AQUA(ChatColor.DARK_AQUA);
+		
+		private ChatColor color;
+		
+		private TeamColors(ChatColor color)
+		{
+			this.color = color;
+		}
+		
+		public ChatColor getColor()
+		{
+			return this.color;
+		}
+		
+	}
+	
+	private TeamColors getNextColor(TeamColors color) 
+	{
+		for(TeamColors colors : TeamColors.values()) {
+			if(colors.ordinal() == color.ordinal() + 1)
+			{	
+				return colors;
+			}
+		}
+		return TeamColors.YELLOW;
+	}
+	
+	@Override
+	@EventHandler
+	public void ScoreboardUpdate(UpdateEvent event)
+	{
+		if (event != null && event.getType() != UpdateType.FAST)
+			return;
+
+		Scoreboard.Reset();
+
+		for (GameTeam team : this.GetTeamList())
+		{
+			//Display Individual Players
+			if (this.GetPlayers(true).size() < 13)
+			{
+				if (!team.IsTeamAlive())
+					continue;
+
+				Scoreboard.WriteBlank();
+
+				for (Player player : team.GetPlayers(true))
+				{
+					Scoreboard.Write(team.GetColor() + player.getName());
+				}
+			}
+
+			//Display Players Alive
+			else
+			{
+				Scoreboard.WriteBlank();
+
+				Scoreboard.Write(team.GetColor() + team.GetName());
+				Scoreboard.Write(team.GetPlayers(true).size() + "" + team.GetColor() + " Alive");
+			}
+		}
+
+		Scoreboard.Draw();
+	}
+
+	@Override
+	public void EndCheck()
+	{
+		if (!IsLive())
+			return;
+
+		ArrayList<GameTeam> teamsAlive = new ArrayList<GameTeam>();
+
+		for (GameTeam team : this.GetTeamList())
+			if (team.GetPlayers(true).size() > 0)
+				teamsAlive.add(team);
+
+		if (teamsAlive.size() <= 1)
+		{
+			//Announce
+			if (teamsAlive.size() > 0)
+				AnnounceEnd(teamsAlive.get(0));
+
+			for (GameTeam team : GetTeamList())
+			{
+				if (WinnerTeam != null && team.equals(WinnerTeam))
+				{
+					for (Player player : team.GetPlayers(false))
+						AddGems(player, 10, "Winning Team", false, false);
+				}
+
+				for (Player player : team.GetPlayers(false))
+					if (player.isOnline())
+						AddGems(player, 10, "Participation", false, false);
+			}
+
+			//End
+			SetState(GameState.End);
+		}
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		return WinnerTeam.GetPlayers(false);
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		if (WinnerTeam == null)
+			return null;
+
+		List<Player> players = new ArrayList<>();
+
+		for (GameTeam team : GetTeamList())
+		{
+			if (team != WinnerTeam)
+				players.addAll(team.GetPlayers(false));
+		}
+
+		return players;
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
index 1f2a1c78c..a416be365 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
@@ -144,9 +144,10 @@ public class WorldData
 	
 	public String GetFolder()
 	{
-		if (Folder == null)
-			Folder = "Game" + Id + "_" + Host.GetName() + "_" + GetFile();
-			
+		if (Folder == null) 
+		{
+			Folder = "Game" + Id + "_" + Host.GetWorldHostName() + "_" + GetFile();
+		}	
 		return Folder;
 	}
 	
@@ -160,7 +161,7 @@ public class WorldData
 		TimingManager.stop("UnzipWorld creating folders");
 		
 		TimingManager.start("UnzipWorld UnzipToDirectory");
-		ZipUtil.UnzipToDirectory("../../update/maps/" + Host.GetName() + "/" + GetFile() + ".zip", folder);
+		ZipUtil.UnzipToDirectory("../../update/maps/" + Host.GetWorldHostName() + "/" + GetFile() + ".zip", folder);
 		TimingManager.stop("UnzipWorld UnzipToDirectory");
 	}
 	
@@ -523,4 +524,5 @@ public class WorldData
 	{
 		return _dataEntries.get(key);
 	}
+	
 }

From 304a51de04c56422b41df9f0328d56434b48cf4b Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 05:44:58 +0200
Subject: [PATCH 013/113] Improving TeamSurvivalGames Scoreboard.

---
 .../survivalgames/TeamSurvivalGames.java      | 59 ++++++++++++-------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index ec709081f..e2dbcbbb7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -3,6 +3,9 @@ package nautilus.game.arcade.game.games.survivalgames;
 import java.util.ArrayList;
 import java.util.List;
 
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
@@ -116,35 +119,51 @@ public class TeamSurvivalGames extends SurvivalGames
 	@EventHandler
 	public void ScoreboardUpdate(UpdateEvent event)
 	{
-		if (event != null && event.getType() != UpdateType.FAST)
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (GetTeamList().isEmpty())
 			return;
 
 		Scoreboard.Reset();
 
-		for (GameTeam team : this.GetTeamList())
+		Scoreboard.WriteBlank();
+
+		Scoreboard.Write(C.cGreen + C.Bold + "Time");
+		Scoreboard.Write(UtilTime.convertString(this.getSecondsSinceStart() * 1000, 0, TimeUnit.FIT));
+
+		Scoreboard.WriteBlank();
+
+		Scoreboard.Write(C.cYellow + C.Bold + "Teams");
+		if (GetTeamList().size() > 7)
 		{
-			//Display Individual Players
-			if (this.GetPlayers(true).size() < 13)
+			Scoreboard.Write("" + GetTeamList().size());
+		}
+		else
+		{
+			for (GameTeam team : GetTeamList())
 			{
-				if (!team.IsTeamAlive())
-					continue;
-
-				Scoreboard.WriteBlank();
-
-				for (Player player : team.GetPlayers(true))
-				{
-					Scoreboard.Write(team.GetColor() + player.getName());
-				}
+				Scoreboard.Write(C.cWhite + team.GetColor() + team.GetName());
 			}
+		}
 
-			//Display Players Alive
-			else
-			{
-				Scoreboard.WriteBlank();
+		Scoreboard.WriteBlank();
 
-				Scoreboard.Write(team.GetColor() + team.GetName());
-				Scoreboard.Write(team.GetPlayers(true).size() + "" + team.GetColor() + " Alive");
-			}
+		if (this.getChestRefillTime() > 0 && this.getDeathMatchTime() > 60)
+		{
+			Scoreboard.Write(C.cGold + C.Bold + "Chest Refill");
+			Scoreboard.Write(UtilTime.convertString(this.getChestRefillTime() * 1000, 0, TimeUnit.FIT));
+		}
+		else if (this.getDeathMatchTime() > 0)
+		{
+			Scoreboard.Write(C.cRed + C.Bold + "Deathmatch");
+			Scoreboard.Write(UtilTime.convertString(
+					Math.min(this.getDeathMatchTime(), this.isDeathMatchTeleported() ? 10 : this.getDeathMatchTime()) * 1000, 0, TimeUnit.FIT));
+		}
+		else
+		{
+			Scoreboard.Write(C.cRed + C.Bold + "Game End");
+			Scoreboard.Write(UtilTime.convertString(Math.max(0, this.getGameEndTime()) * 1000, 0, TimeUnit.FIT));
 		}
 
 		Scoreboard.Draw();

From 0315f6103895221f2548b78fe21e7780e818830b Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Tue, 14 Jul 2015 14:02:35 +1000
Subject: [PATCH 014/113] changed team spawn selection

---
 .../src/nautilus/game/arcade/game/Game.java   |   7 +-
 .../nautilus/game/arcade/game/GameTeam.java   | 112 ++++++++++++------
 .../game/games/evolution/Evolution.java       |   2 -
 .../game/arcade/game/games/quiver/Quiver.java |   1 -
 .../arcade/game/games/quiver/QuiverTeams.java |   1 -
 .../arcade/game/games/skywars/Skywars.java    |   2 +-
 .../arcade/game/games/smash/SuperSmash.java   |   2 +-
 .../game/games/squidshooter/SquidShooter.java |   1 -
 .../games/survivalgames/SurvivalGames.java    |   2 +-
 9 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 388bbd632..0c7ce873d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -193,8 +193,6 @@ public abstract class Game implements Listener
 	public int HungerSet = -1;
 	public int HealthSet = -1;
 
-	public int SpawnDistanceRequirement = 1;
-
 	public boolean PrepareFreeze = true;
 
 	private double _itemMergeRadius = 0;
@@ -211,6 +209,8 @@ public abstract class Game implements Listener
 	
 	public int TickPerTeleport = 1;
 	
+	public boolean SpawnNearAllies = false;
+	
 	public boolean StrictAntiHack = false;
 	
 	public boolean DisableKillCommand = true;
@@ -475,9 +475,6 @@ public abstract class Game implements Listener
 		//Add
 		GetTeamList().add(team);
 
-		//Set Spawn Data
-		team.SetSpawnRequirement(this.SpawnDistanceRequirement);
-
 		System.out.println("Created Team: " + team.GetName());
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index c465dbf1d..dee18f3d2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -60,13 +60,11 @@ public class GameTeam
 	private HashMap<Player, PlayerState> _players = new HashMap<Player, PlayerState>();
 
 	private ArrayList<Location> _spawns;
-
+	
 	private Creature _teamEntity = null;
 
 	private HashSet<Kit> _kitRestrict = new HashSet<Kit>();
 
-	private int _spawnDistance = 0;
-
 	private boolean _visible = true;
 
 	//Records order players go out in
@@ -99,40 +97,89 @@ public class GameTeam
 
 	public Location GetSpawn() 
 	{	
-		//		ArrayList<Location> valid = new ArrayList<Location>();
-
-		Location best = null;
-		double bestDist = 0;
-
-		for (Location loc : _spawns)
+		//Spawn Allies Together!
+		if (Host.IsLive() && Host.SpawnNearAllies)
 		{
-			double closestPlayer = -1;
+			Location closestLoc = null;
+			double closestDist = 0;
 
-			for (Player player : Host.GetPlayers(true))
+			for (Location loc : _spawns)
 			{
-				double playerDist = UtilMath.offsetSquared(player.getLocation(), loc);
-
-				if (closestPlayer == -1 || playerDist < closestPlayer)
-					closestPlayer = playerDist;
+				//Check if Location is closer!
+				for (Player player : this.GetPlayers(true))
+				{
+					//Different Worlds
+					if (!player.getWorld().equals(loc.getWorld()))
+						continue;
+					
+					double dist = UtilMath.offset(player.getLocation(), loc);
+					
+					//Dont Spawn Inside Ally
+					if (dist < 0.75)
+						continue;
+					
+					//Find Closest Enemy
+					double closestEnemy = -1;
+					
+					for (Player enemy : Host.GetPlayers(true))
+					{
+						if (!enemy.getWorld().equals(loc.getWorld()))
+							continue;
+						
+						if (this.HasPlayer(enemy))
+							continue;
+						
+						double enemyDist = UtilMath.offset(player.getLocation(), loc);
+						
+						if (closestEnemy == -1 || enemyDist < closestEnemy)
+						{
+							closestEnemy = enemyDist;
+						}
+					}
+					
+					//Dont Spawn Inside Enemy
+					if (closestEnemy != -1 && closestEnemy < 0.75)
+						continue;
+					
+					//Good Location!
+					if (closestLoc == null || dist < closestDist)
+					{
+						closestLoc = loc;
+						closestDist = dist;
+					}
+				}	
 			}
 
-			if (best == null || closestPlayer > bestDist)
-			{
-				best = loc;
-				bestDist = closestPlayer;
-			}
-
-			//			if (closestPlayer > _spawnDistance * _spawnDistance)
-			//			{
-			//				valid.add(loc);
-			//			}
+			if (closestLoc != null)
+				return closestLoc;
 		}
+		//Spawn Furthest Away!
+		else
+		{
+			Location furthestLoc = null;
+			double furthestDist = 0;
 
-		//		if (valid.size() > 0)
-		//			valid.get(UtilMath.r(valid.size()));
+			for (Location loc : _spawns)
+			{
+				for (Player player : Host.GetPlayers(true))
+				{
+					//Different Worlds
+					if (!player.getWorld().equals(loc.getWorld()))
+						continue;
+					
+					double dist = UtilMath.offsetSquared(player.getLocation(), loc);
 
-		if (best != null)
-			return best;
+					if (furthestLoc == null || dist > furthestDist)
+					{
+						furthestLoc = loc;
+						furthestDist = dist;
+					}
+				}
+			}
+
+			if (furthestLoc != null)
+				return furthestLoc;
+		}
 
 		return _spawns.get(UtilMath.r(_spawns.size()));
 	}
@@ -333,11 +380,6 @@ public class GameTeam
 		_spawns = spawns;
 	}
 
-	public void SetSpawnRequirement(int value)
-	{
-		_spawnDistance = value;
-	}
-
 	public void SetVisible(boolean b)
 	{
 		_visible = b;
@@ -390,6 +432,4 @@ public class GameTeam
 
 		return _places;
 	}
-
-	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
index 3fb7a570f..338056822 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
@@ -74,8 +74,6 @@ public class Evolution extends SoloGame
 		this.DeathOut = false;
 		
 		this.PrepareFreeze = false;
-
-		this.SpawnDistanceRequirement = 16;
 		
 		_scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Evolutions", "dummy");
 		_scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
index bbd123b34..25b8b8fee 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
@@ -72,7 +72,6 @@ public class Quiver extends SoloGame
 		this.DamageSelf = false;
 		this.DamageTeamSelf = true;
 		this.PrepareFreeze = false;
-		this.SpawnDistanceRequirement = 16;
 		this.BlockBreakAllow.add(102);
 		this.BlockBreakAllow.add(20);
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverTeams.java
index c4aecbae2..2d871d801 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverTeams.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverTeams.java
@@ -59,7 +59,6 @@ public class QuiverTeams extends TeamGame
 		this.DamageSelf = false;
 		this.DamageTeamSelf = false;
 		this.PrepareFreeze = false;
-		this.SpawnDistanceRequirement = 24;
 		this.BlockBreakAllow.add(102);
 		this.BlockBreakAllow.add(20);
 		this.BlockBreakAllow.add(18);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index b14f2e2f4..0d2e6a08b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -157,7 +157,7 @@ public abstract class Skywars extends Game
 		WorldTimeSet = 0;	
 		WorldBoundaryKill = false;
 
-		SpawnDistanceRequirement = 48;
+		SpawnNearAllies = true;
 
 		DamageSelf = true;
 		DamageTeamSelf = true;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index b17ab43d3..d5f6d7869 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -120,7 +120,7 @@ public abstract class SuperSmash extends Game
 
 		this.DeathSpectateSecs = 4;
 
-		this.SpawnDistanceRequirement = 32;
+		SpawnNearAllies = true;
 
 		this.WorldWaterDamage = 1000;
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/SquidShooter.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/SquidShooter.java
index c7334f60e..8842a3799 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/SquidShooter.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/SquidShooter.java
@@ -48,7 +48,6 @@ public class SquidShooter extends SoloGame
 		this.DamageSelf = false;
 		this.DamageTeamSelf = true;
 		this.PrepareFreeze = false;
-		this.SpawnDistanceRequirement = 16;
 		this.CompassEnabled = true;
 		this.KitRegisterState = GameState.Prepare;
 	}	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 300ac0c02..64d9fa498 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -217,7 +217,7 @@ public abstract class SurvivalGames extends Game
 		WorldTimeSet = 0;
 		WorldBoundaryKill = false;
 
-		SpawnDistanceRequirement = 48;
+		SpawnNearAllies = true;
 
 		DamageSelf = true;
 		DamageTeamSelf = true;

From 2b10aa2cf9a08ba2384fa80df2db94e110fa34ac Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 08:19:33 +0200
Subject: [PATCH 015/113] Improving spawn selection in SkywarsTeams.

---
 .../game/games/skywars/TeamSkywars.java       | 64 ++++++++++++++++++-
 .../game/games/smash/TeamSuperSmash.java      |  4 +-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 2ab16c1aa..3be8754db 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -12,9 +12,12 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.smash.TeamSuperSmash.TeamColors;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -45,9 +48,57 @@ public class TeamSkywars extends Skywars
 		if (event.GetState() != GameState.Recruit)
 			return;
 		
-		ArrayList<Location> spawns = this.GetTeamList().get(0).GetSpawns();
+		ArrayList<Location> tempSpawns = this.GetTeamList().get(0).GetSpawns();
 		this.GetTeamList().clear();
 		
+		ArrayList<Location> spawns = new ArrayList<Location>();
+		for(Location location : tempSpawns)
+		{
+			for(int x = -1; x <= 1; x++)
+			{
+				for(int z = -1; z <= 1; z++)
+				{
+					if(x != 0 && z != 0)
+					{
+						Location spawnLocation = location.clone().add(x, 0, z);
+						if(spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(BlockFace.DOWN).getType() == Material.AIR)
+						{
+							boolean foundBlock = false;
+							Location tempLocation = spawnLocation.clone();
+							BlockFace currentBlockFace = BlockFace.NORTH; 
+							while(!foundBlock)
+							{
+								for(BlockFace face : BlockFace.values())
+								{
+									if(spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(face).getType() != Material.AIR)
+									{
+										spawnLocation = tempLocation.getWorld().getBlockAt(tempLocation).getRelative(face).getLocation().add(0, 1, 0);
+										foundBlock = true;
+									}
+								}
+								if(!foundBlock)
+								{
+									tempLocation = spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(currentBlockFace).getLocation();
+									currentBlockFace = getBlockface(currentBlockFace);
+									if(currentBlockFace == BlockFace.SELF)
+									{
+										currentBlockFace = getBlockface(currentBlockFace);			
+										tempLocation = spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(currentBlockFace).getLocation();
+										spawnLocation = tempLocation;
+									}
+								}
+							}
+						}
+						while(spawnLocation.getWorld().getBlockAt(spawnLocation).getType() != Material.AIR)
+						{
+							spawnLocation.add(0, 1, 0);
+						}
+						spawns.add(spawnLocation);
+					}
+				}
+			}
+		}
+		
 		TeamColors color = TeamColors.DARK_AQUA;
 		
 		if(!this.ForceTeamSize) 
@@ -73,6 +124,17 @@ public class TeamSkywars extends Skywars
 		}
 	}
 	
+	private BlockFace getBlockface(BlockFace face) 
+	{
+		for(TeamColors faces : TeamColors.values()) {
+			if(faces.ordinal() == face.ordinal() + 1)
+			{	
+				return face;
+			}
+		}
+		return BlockFace.NORTH;
+	}
+	
 	private enum TeamColors
 	{
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 16070df29..a0a690ba1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -9,9 +9,12 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.skywars.TeamSkywars.TeamColors;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -103,7 +106,6 @@ public class TeamSuperSmash extends SuperSmash
 		{
 			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
 			{
-				System.out.println("Test");
 				color = getNextColor(color);
 				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
 				team.SetVisible(true);

From 3a2011ee6a9c485bcd3b0745e4f820b6e5c060b0 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 13:22:59 +0200
Subject: [PATCH 016/113] Improving Map System: GameTypes can have more
 mapSources now.

---
 .../src/nautilus/game/arcade/GameType.java    | 44 ++++++++---
 .../game/arcade/command/GameCommand.java      |  2 +-
 .../game/arcade/command/SetCommand.java       | 23 +++++-
 .../src/nautilus/game/arcade/game/Game.java   | 79 ++++++++++++++++---
 .../game/games/skywars/TeamSkywars.java       |  1 -
 .../game/games/smash/TeamSuperSmash.java      |  1 -
 .../arcade/managers/GameCreationManager.java  |  1 +
 .../nautilus/game/arcade/world/WorldData.java | 44 ++++++++++-
 8 files changed, 161 insertions(+), 34 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index f02cf0d08..f38aace98 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -1,5 +1,7 @@
 package nautilus.game.arcade;
 
+import java.util.Arrays;
+
 import mineplex.core.game.GameCategory;
 import mineplex.core.game.GameDisplay;
 import nautilus.game.arcade.game.Game;
@@ -99,7 +101,7 @@ public enum GameType
 	
 	Smash(SoloSuperSmash.class, GameDisplay.Smash),
 	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, GameType.Smash),
+	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, new GameType[]{GameType.Smash}, false),
 	Snake(Snake.class, GameDisplay.Snake),
 	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
 	SnowFight(SnowFight.class, GameDisplay.SnowFight),
@@ -108,7 +110,7 @@ public enum GameType
 	SquidShooter(SquidShooter.class, GameDisplay.SquidShooter),
 	Stacker(Stacker.class, GameDisplay.Stacker),
 	SurvivalGames(SoloSurvivalGames.class, GameDisplay.SurvivalGames),
-	SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, GameType.SurvivalGames),
+	SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, new GameType[]{GameType.SurvivalGames}, false),
 	Tug(Tug.class, GameDisplay.Tug),
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
@@ -119,13 +121,24 @@ public enum GameType
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
 	Skywars(SoloSkywars.class, GameDisplay.Skywars),
-	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, GameType.Skywars),
+	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
 	
-	Event(EventGame.class, GameDisplay.Event);
+	Event(EventGame.class, GameDisplay.Event, new GameType[]{
+		GameType.BaconBrawl, GameType.Barbarians, GameType.Bridge, GameType.Build, GameType.Build,
+		GameType.Cards, GameType.CastleSiege, GameType.ChampionsDominate, GameType.ChampionsTDM, GameType.Christmas, 
+		GameType.DeathTag, GameType.DragonEscape, GameType.DragonEscapeTeams, GameType.DragonRiders, GameType.Dragons,
+		GameType.Draw, GameType.Evolution, GameType.Gravity, GameType.Halloween, GameType.HideSeek,
+		GameType.HoleInTheWall, GameType.Horse, GameType.Micro, GameType.MilkCow, GameType.MineStrike, GameType.MineWare,
+		GameType.OldMineWare, GameType.Paintball, GameType.Quiver, GameType.QuiverTeams, GameType.Runner, GameType.SearchAndDestroy,
+		GameType.Sheep, GameType.Skywars, GameType.SkywarsTeams, GameType.Smash, GameType.SmashDomination, GameType.SmashTeams,
+		GameType.Snake, GameType.SneakyAssassins, GameType.SnowFight, GameType.Spleef, GameType.SpleefTeams, GameType.SquidShooter,
+		GameType.Stacker, GameType.SurvivalGames, GameType.SurvivalGamesTeams, GameType.Tug, GameType.TurfWars, GameType.UHC,
+		GameType.WitherAssault, GameType.Wizards, GameType.ZombieSurvival}, true);
 
 	GameDisplay _display;
 	boolean _enforceResourcePack;
-	GameType _mapSource;
+	GameType[] _mapSource;
+	boolean _ownMaps;
 	String _resourcePack;
 	Class<? extends Game> _gameClass;
 	
@@ -134,28 +147,29 @@ public enum GameType
 
 	GameType(Class<? extends Game> gameClass, GameDisplay display)
 	{
-		this(gameClass, display, null, false, null);
+		this(gameClass, display, null, false, null, true);
 	}
 
 	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack)
 	{
-		this(gameClass, display, resourcePackUrl, enforceResourcePack, null);
+		this(gameClass, display, resourcePackUrl, enforceResourcePack, null, true);
 	}
 	
-	GameType(Class<? extends Game> gameClass, GameDisplay display, GameType mapSource)
+	GameType(Class<? extends Game> gameClass, GameDisplay display, GameType[] mapSource, boolean ownMap)
 	{
-		this(gameClass, display, null, false, mapSource);
+		this(gameClass, display, null, false, mapSource, ownMap);
 	}
 	
-	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack, GameType mapSource)
+	GameType(Class<? extends Game> gameClass, GameDisplay display, String resourcePackUrl, boolean enforceResourcePack, GameType[] mapSource, boolean ownMaps)
 	{
 		_display = display;
 		_gameClass = gameClass;
 		_resourcePack = resourcePackUrl;
 		_enforceResourcePack = enforceResourcePack;
 		_mapSource = mapSource;
+		_ownMaps = ownMaps;
 	}
-
+	
 	public Class<? extends Game> getGameClass()
 	{
 		return _gameClass;
@@ -171,10 +185,15 @@ public enum GameType
 		return _resourcePack;
 	}
 	
-	public GameType getMapSource()
+	public GameType[] getMapSource()
 	{
 		return _mapSource;
 	}
+	
+	public boolean ownMaps()
+	{
+		return _ownMaps;
+	}
 
 	public String GetName()
 	{
@@ -200,4 +219,5 @@ public enum GameType
 	{
 		return _display.getGameCategory();
 	}
+	
 }
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
index ec1eb238f..a341ddc18 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
@@ -25,7 +25,7 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
 		UtilPlayer.message(caller, F.main(Plugin.getName(), "Commands List:"));
 		UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ADMIN));
 		UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ADMIN));
-		UtilPlayer.message(caller, F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.help("/game set <GameType> (MapSource) (Map)", "Set the current game or next game", Rank.ADMIN));
 		UtilPlayer.message(caller, F.main("Tip", "Use TAB for games/maps!"));
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
index 7db88b496..9460da68a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
@@ -29,16 +29,31 @@ public class SetCommand extends CommandBase<ArcadeManager>
 		 
 		if (args == null || args.length == 0)
 		{
-			caller.sendMessage(F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
+			caller.sendMessage(F.help("/game set <GameType> (MapSource) (Map)", "Set the current game or next game", Rank.ADMIN));
 			return; 
 		}
 		
 		String game = args[0].toLowerCase();
 			
-		if (args.length > 1)
+		if (args.length >= 2)
 		{
-			Plugin.GetGameCreationManager().MapPref = args[1];
-			UtilPlayer.message(caller, C.cAqua + C.Bold + "Map Preference: " + ChatColor.RESET + args[1]);
+			String map = "";
+			String source = "";
+			if(args.length == 3)
+			{
+				Plugin.GetGameCreationManager().MapSource = args[1];
+				Plugin.GetGameCreationManager().MapPref = args[2];
+				source = args[1];
+				map = args[2]; 
+			} 
+			else 
+			{
+				Plugin.GetGameCreationManager().MapSource = args[0];
+				Plugin.GetGameCreationManager().MapPref = args[1];
+				source = args[0];
+				map = args[1];
+			}
+			UtilPlayer.message(caller, C.cAqua + C.Bold + "Map Preference: " + ChatColor.RESET + source + ":" + map);
 		}
 		
 		//Parse Game
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 0c7ce873d..7a413d04a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -86,7 +86,7 @@ public abstract class Game implements Listener
 	protected String[] _gameDesc;
 
 	//Map
-	private ArrayList<String> _files;
+	private HashMap<GameType, ArrayList<String>> _files;
 
 	//State 
 	private GameState _gameState = GameState.Loading;
@@ -281,16 +281,28 @@ public abstract class Game implements Listener
 		Scoreboard = new GameScoreboard(this);
 
 		//Map Select
-		_files = Manager.LoadFiles(GetWorldHostName());
+		_files = new HashMap<GameType, ArrayList<String>>();
+		for(GameType type : GetWorldHostNames())
+		{
+			_files.put(type, Manager.LoadFiles(type.GetName()));
+		}
 		if (Manager.GetGameCreationManager().MapPref != null)
 		{
-			ArrayList<String> matches = new ArrayList<String>();
-			for (String cur : _files)
+			HashMap<GameType, ArrayList<String>> matches = new HashMap<GameType, ArrayList<String>>();
+			for (GameType game : _files.keySet())
 			{
-				if (cur.toLowerCase().contains(Manager.GetGameCreationManager().MapPref.toLowerCase()))
+				ArrayList<String> list = new ArrayList<String>();
+				for(String cur : _files.get(game))
 				{
-					matches.add(cur);
-					System.out.print("Map Preference: " + cur);
+					if (cur.toLowerCase().contains(Manager.GetGameCreationManager().MapPref.toLowerCase()))
+					{
+						if(game.toString().toLowerCase().contains(Manager.GetGameCreationManager().MapSource.toLowerCase()))
+						{
+							list.add(cur);
+							System.out.print("Map Preference: " + cur);
+							matches.put(game, list);
+						}
+					}
 				}
 			}
 
@@ -298,6 +310,7 @@ public abstract class Game implements Listener
 				_files = matches;
 
 			Manager.GetGameCreationManager().MapPref = null;
+			Manager.GetGameCreationManager().MapSource = null;
 		}
 		WorldData = new WorldData(this);
 
@@ -332,7 +345,7 @@ public abstract class Game implements Listener
 		_kits = kits;
 	}
 
-	public ArrayList<String> GetFiles()
+	public HashMap<GameType, ArrayList<String>> GetFiles()
 	{
 		return _files;
 	}
@@ -342,15 +355,59 @@ public abstract class Game implements Listener
 		return _gameType.GetName();
 	}
 	
-	public String GetWorldHostName()
+	public GameType[] GetWorldHostNames()
 	{
-		String mapSource = GetName();
+		GameType[] mapSource = new GameType[]{GetType()};
 		if(GetType().getMapSource() != null)
 		{
-			mapSource = GetType().getMapSource().GetName();
+			if(GetType().ownMaps())
+			{
+				int i = 1;
+				mapSource = new GameType[GetType().getMapSource().length + 1];
+				for(GameType type : GetType().getMapSource())
+				{
+					mapSource[i] = type;
+					i++;
+				}
+				mapSource[0] = GetType();
+			} 
+			else
+			{
+				mapSource = GetType().getMapSource();
+			}
 		}
 		return mapSource;
 	}
+	
+	public String GetGameNamebyMap(String game, String map)
+	{
+		for(GameType type : _files.keySet())
+		{
+			if(type.GetName().toLowerCase().contains(game.toLowerCase()))
+			{
+				for(String string : _files.get(type))
+				{
+					if(string.toLowerCase().contains(map.toLowerCase()))
+					{
+						return type.GetName();
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	public GameType GetGameByMapList(ArrayList<String> maps) 
+	{
+		for(GameType game : _files.keySet())
+		{
+			if(maps.equals(_files.get(game)))
+			{
+				return game;
+			}
+		}
+		return null;
+	}
 
 	public String GetMode()
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 3be8754db..3a372bdd5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -12,7 +12,6 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.games.smash.TeamSuperSmash.TeamColors;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index a0a690ba1..8da1dd80b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -9,7 +9,6 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.games.skywars.TeamSkywars.TeamColors;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
index 401309e95..812aa7757 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
@@ -36,6 +36,7 @@ public class GameCreationManager implements Listener
 	private String _lastMap = "";
 	private ArrayList<GameType> _lastGames = new ArrayList<GameType>();
 
+	public String MapSource = null;
 	public String MapPref = null;
 	
 	public GameCreationManager(ArcadeManager manager)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
index a416be365..1bb5955e0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
@@ -16,6 +16,7 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.WorldUtil;
 import mineplex.core.common.util.ZipUtil;
 import mineplex.core.timing.TimingManager;
+import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.games.uhc.UHC;
 import net.minecraft.server.v1_7_R4.ChunkPreLoadEvent;
@@ -50,6 +51,8 @@ public class WorldData
 	public String MapName = "Null";
 	public String MapAuthor = "Null";
 	
+	public GameType Game = null;
+	
 	public HashMap<String, ArrayList<Location>> SpawnLocs = new HashMap<String, ArrayList<Location>>();
 	private HashMap<String, ArrayList<Location>> DataLocs = new HashMap<String, ArrayList<Location>>();
 	private HashMap<String, ArrayList<Location>> CustomLocs = new HashMap<String, ArrayList<Location>>();
@@ -67,6 +70,7 @@ public class WorldData
 	public void Initialize()
 	{
 		final WorldData worldData = this;
+		GetFile();
 		
 		UtilServer.getServer().getScheduler().runTaskAsynchronously(Host.Manager.getPlugin(), new Runnable()
 		{
@@ -121,18 +125,50 @@ public class WorldData
 		});
 	}
 	
+	protected GameType GetGame()
+	{
+		return Game;
+	}
+	
 	protected String GetFile()
 	{
 		if (File == null)
 		{
-			File = Host.GetFiles().get(UtilMath.r(Host.GetFiles().size()));
+			GameType game = null;
+			int gameRandom = UtilMath.r(Host.GetFiles().size());
+			int i = 0;
+			for(GameType type : Host.GetFiles().keySet())
+			{
+				if(i == gameRandom)
+				{
+					game = type; 
+					break;
+				}
+				i++;
+			}
+			Game = game;
+			int map = UtilMath.r(Host.GetFiles().get(game).size());
+			File = Host.GetFiles().get(game).get(map);
 			
 			//Don't allow repeat maps.
 			if (Host.GetFiles().size() > 1)
 			{
 				while (File.equals(Host.Manager.GetGameCreationManager().GetLastMap()))
 				{
-					File = Host.GetFiles().get(UtilMath.r(Host.GetFiles().size()));
+					GameType _game = null;
+					int _gameRandom = UtilMath.r(Host.GetFiles().size());
+					int _i = 0;
+					for(GameType _type : Host.GetFiles().keySet())
+					{
+						if(_i == _gameRandom)
+						{
+							_game = _type; 
+							break;
+						}
+						_i++;
+					}
+					int _map = UtilMath.r(Host.GetFiles().get(game).size());
+					File = Host.GetFiles().get(_game).get(_map);
 				}
 			}
 		}
@@ -146,7 +182,7 @@ public class WorldData
 	{
 		if (Folder == null) 
 		{
-			Folder = "Game" + Id + "_" + Host.GetWorldHostName() + "_" + GetFile();
+			Folder = "Game" + Id + "_" + GetGame().GetName() + "_" + GetFile();
 		}	
 		return Folder;
 	}
@@ -161,7 +197,7 @@ public class WorldData
 		TimingManager.stop("UnzipWorld creating folders");
 		
 		TimingManager.start("UnzipWorld UnzipToDirectory");
-		ZipUtil.UnzipToDirectory("../../update/maps/" + Host.GetWorldHostName() + "/" + GetFile() + ".zip", folder);
+		ZipUtil.UnzipToDirectory("../../update/maps/" + GetGame().GetName() + "/" + GetFile() + ".zip", folder);
 		TimingManager.stop("UnzipWorld UnzipToDirectory");
 	}
 	

From e6aec58ecebf97ddb393142b8438eb17daac13a1 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 23:14:56 +0200
Subject: [PATCH 017/113] Updating Map source.

---
 .../src/nautilus/game/arcade/GameType.java             | 10 +++++-----
 .../game/arcade/game/games/skywars/TeamSkywars.java    |  2 +-
 .../game/arcade/game/games/smash/TeamSuperSmash.java   |  4 +---
 .../game/games/survivalgames/TeamSurvivalGames.java    |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index f38aace98..6e9061317 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -101,7 +101,7 @@ public enum GameType
 	
 	Smash(SoloSuperSmash.class, GameDisplay.Smash),
 	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, new GameType[]{GameType.Smash}, false),
+	//SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, new GameType[]{GameType.Smash}, false),
 	Snake(Snake.class, GameDisplay.Snake),
 	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
 	SnowFight(SnowFight.class, GameDisplay.SnowFight),
@@ -110,7 +110,7 @@ public enum GameType
 	SquidShooter(SquidShooter.class, GameDisplay.SquidShooter),
 	Stacker(Stacker.class, GameDisplay.Stacker),
 	SurvivalGames(SoloSurvivalGames.class, GameDisplay.SurvivalGames),
-	SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, new GameType[]{GameType.SurvivalGames}, false),
+	//SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, new GameType[]{GameType.SurvivalGames}, false),
 	Tug(Tug.class, GameDisplay.Tug),
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
@@ -121,7 +121,7 @@ public enum GameType
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
 	Skywars(SoloSkywars.class, GameDisplay.Skywars),
-	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
+	//SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
 	
 	Event(EventGame.class, GameDisplay.Event, new GameType[]{
 		GameType.BaconBrawl, GameType.Barbarians, GameType.Bridge, GameType.Build, GameType.Build,
@@ -130,9 +130,9 @@ public enum GameType
 		GameType.Draw, GameType.Evolution, GameType.Gravity, GameType.Halloween, GameType.HideSeek,
 		GameType.HoleInTheWall, GameType.Horse, GameType.Micro, GameType.MilkCow, GameType.MineStrike, GameType.MineWare,
 		GameType.OldMineWare, GameType.Paintball, GameType.Quiver, GameType.QuiverTeams, GameType.Runner, GameType.SearchAndDestroy,
-		GameType.Sheep, GameType.Skywars, GameType.SkywarsTeams, GameType.Smash, GameType.SmashDomination, GameType.SmashTeams,
+		GameType.Sheep, GameType.Skywars, /*GameType.SkywarsTeams,*/ GameType.Smash, GameType.SmashDomination, /*GameType.SmashTeams,*/
 		GameType.Snake, GameType.SneakyAssassins, GameType.SnowFight, GameType.Spleef, GameType.SpleefTeams, GameType.SquidShooter,
-		GameType.Stacker, GameType.SurvivalGames, GameType.SurvivalGamesTeams, GameType.Tug, GameType.TurfWars, GameType.UHC,
+		GameType.Stacker, GameType.SurvivalGames, /*GameType.SurvivalGamesTeams,*/ GameType.Tug, GameType.TurfWars, GameType.UHC,
 		GameType.WitherAssault, GameType.Wizards, GameType.ZombieSurvival}, true);
 
 	GameDisplay _display;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 3a372bdd5..5f519d463 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -29,7 +29,7 @@ public class TeamSkywars extends Skywars
 
 	public TeamSkywars(ArcadeManager manager)
 	{
-		super(manager, GameType.SkywarsTeams, 
+		super(manager, GameType.Skywars, 
 				 new String[]
 							{
 					"Free for all battle in the sky!", 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 8da1dd80b..2b8eae10a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -12,8 +12,6 @@ import nautilus.game.arcade.game.GameTeam;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -26,7 +24,7 @@ public class TeamSuperSmash extends SuperSmash
 	
 	public TeamSuperSmash(ArcadeManager manager) 
 	{
-		super(manager, GameType.SmashTeams, 
+		super(manager, GameType.Smash, 
 				new String[]
 						{
 				"Each player has 3 respawns",
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index e2dbcbbb7..a1db9a5f8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -27,7 +27,7 @@ public class TeamSurvivalGames extends SurvivalGames
 
 	public TeamSurvivalGames(ArcadeManager manager) 
 	{
-		super(manager, GameType.SurvivalGamesTeams,
+		super(manager, GameType.SurvivalGames,
 						new String[]
 								{
 				"Search for chests to find loot",

From 9eee425792b82d7553622b78853db47b2e38f9d1 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Tue, 14 Jul 2015 23:46:56 +0200
Subject: [PATCH 018/113] revert mistake from last commit.

---
 .../src/nautilus/game/arcade/GameType.java                | 8 +++-----
 .../game/arcade/game/games/skywars/TeamSkywars.java       | 2 +-
 .../game/arcade/game/games/smash/TeamSuperSmash.java      | 2 +-
 .../game/games/survivalgames/TeamSurvivalGames.java       | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 6e9061317..7a844b70b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -1,7 +1,5 @@
 package nautilus.game.arcade;
 
-import java.util.Arrays;
-
 import mineplex.core.game.GameCategory;
 import mineplex.core.game.GameDisplay;
 import nautilus.game.arcade.game.Game;
@@ -101,7 +99,7 @@ public enum GameType
 	
 	Smash(SoloSuperSmash.class, GameDisplay.Smash),
 	SmashDomination(SuperSmashDominate.class, GameDisplay.SmashDomination),
-	//SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, new GameType[]{GameType.Smash}, false),
+	SmashTeams(TeamSuperSmash.class, GameDisplay.SmashTeams, new GameType[]{GameType.Smash}, false),
 	Snake(Snake.class, GameDisplay.Snake),
 	SneakyAssassins(SneakyAssassins.class, GameDisplay.SneakyAssassins),
 	SnowFight(SnowFight.class, GameDisplay.SnowFight),
@@ -110,7 +108,7 @@ public enum GameType
 	SquidShooter(SquidShooter.class, GameDisplay.SquidShooter),
 	Stacker(Stacker.class, GameDisplay.Stacker),
 	SurvivalGames(SoloSurvivalGames.class, GameDisplay.SurvivalGames),
-	//SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, new GameType[]{GameType.SurvivalGames}, false),
+	SurvivalGamesTeams(TeamSurvivalGames.class, GameDisplay.SurvivalGamesTeams, new GameType[]{GameType.SurvivalGames}, false),
 	Tug(Tug.class, GameDisplay.Tug),
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
@@ -121,7 +119,7 @@ public enum GameType
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
 	Skywars(SoloSkywars.class, GameDisplay.Skywars),
-	//SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
+	SkywarsTeams(TeamSkywars.class, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
 	
 	Event(EventGame.class, GameDisplay.Event, new GameType[]{
 		GameType.BaconBrawl, GameType.Barbarians, GameType.Bridge, GameType.Build, GameType.Build,
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 5f519d463..3a372bdd5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -29,7 +29,7 @@ public class TeamSkywars extends Skywars
 
 	public TeamSkywars(ArcadeManager manager)
 	{
-		super(manager, GameType.Skywars, 
+		super(manager, GameType.SkywarsTeams, 
 				 new String[]
 							{
 					"Free for all battle in the sky!", 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 2b8eae10a..6c2d0cffe 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -24,7 +24,7 @@ public class TeamSuperSmash extends SuperSmash
 	
 	public TeamSuperSmash(ArcadeManager manager) 
 	{
-		super(manager, GameType.Smash, 
+		super(manager, GameType.SmashTeams, 
 				new String[]
 						{
 				"Each player has 3 respawns",
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index a1db9a5f8..e2dbcbbb7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -27,7 +27,7 @@ public class TeamSurvivalGames extends SurvivalGames
 
 	public TeamSurvivalGames(ArcadeManager manager) 
 	{
-		super(manager, GameType.SurvivalGames,
+		super(manager, GameType.SurvivalGamesTeams,
 						new String[]
 								{
 				"Search for chests to find loot",

From d46ac59e10d2a47f6dee3b7910a6fea0ec0aee95 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Thu, 16 Jul 2015 01:34:57 +0200
Subject: [PATCH 019/113] Added project start

---
 .../arcade/game/games/wither/WitherGame.java  | 527 ++++++++++--------
 1 file changed, 284 insertions(+), 243 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index b11d44b68..bbe50ac57 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -57,76 +57,74 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	private GameTeam _withers;
 
 	private double _witherFactor = 2.5;
-	
+
 	private int _yLimit = 0;
-	
+
 	private long _gameTime = 300000;
-	
+
 	private HashMap<Player, PlayerCopy> _doubles = new HashMap<Player, PlayerCopy>();
-	
-//	private int _livesPerPlayer = 3;
-//	private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
-		
+
+	// private int _livesPerPlayer = 3;
+	// private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
+
 	private HashSet<BlockData> _blocks = new HashSet<BlockData>();
-	
+
 	public WitherGame(ArcadeManager manager)
 	{
 		super(manager, GameType.WitherAssault,
 
-				new Kit[] 
-						{ 
-				new KitHumanArcher(manager),
-				//new KitHumanBuilder(manager),
-				//new KitHumanRunner(manager),
-				new NullKit(manager),
-				new NullKit(manager),
-				new NullKit(manager),
+		new Kit[]
+		{
+				new KitHumanArcher(manager), new NullKit(manager),
+				new NullKit(manager), new NullKit(manager),
 				new KitWitherMinion(manager),
-				//new KitWitherWeb(manager),
-				//new KitWitherWeb(manager),
-						},
+		},
 
-						new String[]
-								{
-				
-				C.cGreen + "Humans" + C.cWhite + "  Run and hide from the Withers",
+		new String[]
+		{
+
+				C.cGreen + "Humans" + C.cWhite
+						+ "  Run and hide from the Withers",
 				C.cGreen + "Humans" + C.cWhite + "  Revive your dead allies!",
-				C.cGreen + "Humans" + C.cWhite + "  Win by surviving for 5 minutes",
+				C.cGreen + "Humans" + C.cWhite
+						+ "  Win by surviving for 5 minutes",
 				" ",
-				C.cRed + "Withers" + C.cWhite + "  Moves very slowly when near ground",
-				C.cRed + "Withers" + C.cWhite + "  Kill all the Humans within 5 Minutes",
-								});
- 
+				C.cRed + "Withers" + C.cWhite
+						+ "  Moves very slowly when near ground",
+				C.cRed + "Withers" + C.cWhite
+						+ "  Kill all the Humans within 5 Minutes",
+		});
+
 		this.DeathOut = true;
 		this.DamageTeamSelf = false;
 		this.DamageSelf = false;
 		this.DeathSpectateSecs = 4;
 		this.HungerSet = 20;
 		this.WorldBoundaryKill = false;
-		
+
 		this.CompassEnabled = true;
 		this.CompassGiveItem = false;
-		
+
 		this.KitRegisterState = GameState.Prepare;
-		
+
 		this.TeamArmor = true;
 		this.TeamArmorHotbar = false;
-		
-		_help = new String[]  
-				{ 
-				C.cRed + C.Bold + "This game is still under development!",
-				  
-				};  
+
+		_help = new String[]
+		{
+			C.cRed + C.Bold + "This game is still under development!",
+
+		};
 	}
 
 	@Override
-	public void ParseData() 
+	public void ParseData()
 	{
 		_yLimit = WorldData.GetDataLocs("RED").get(0).getBlockY();
 	}
-	
+
 	@EventHandler
-	public void teamSetup(GameStateChangeEvent event) 
+	public void teamSetup(GameStateChangeEvent event)
 	{
 		if (event.GetState() != GameState.Recruit)
 			return;
@@ -140,7 +138,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 					_withers = team;
 					_withers.SetName("Withers");
 					_withers.SetColor(ChatColor.RED);
-					
+
 					if (!kit.GetName().contains("Wither"))
 						team.GetRestrictedKits().add(kit);
 				}
@@ -149,7 +147,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 					_runners = team;
 					_runners.SetName("Humans");
 					_runners.SetColor(ChatColor.GREEN);
-					
+
 					if (kit.GetName().contains("Wither"))
 						team.GetRestrictedKits().add(kit);
 				}
@@ -166,95 +164,106 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (event.getType() != UpdateType.FAST)
 			return;
 
-		//Not Enough Players
+		// Not Enough Players
 		if (_runners.GetPlayers(true).size() < 2)
 			return;
 
-		//Enough Withers
-		if  (_withers.GetPlayers(true).size() * _witherFactor >= _runners.GetPlayers(true).size())
+		// Enough Withers
+		if (_withers.GetPlayers(true).size() * _witherFactor >= _runners
+				.GetPlayers(true).size())
 			return;
-		
-		
+
 		Player player = UtilAlg.Random(_runners.GetPlayers(true));
 		setWither(player, true);
 	}
 
 	public void setWither(Player player, boolean forced)
 	{
-//		_lives.remove(player);
-		
+		// _lives.remove(player);
+
 		SetPlayerTeam(player, _withers, true);
-		
-		//Kit
-		Kit newKit = GetKits()[4];		
+
+		// Kit
+		Kit newKit = GetKits()[4];
 
 		SetKit(player, newKit, false);
 		newKit.ApplyKit(player);
-		
+
 		player.teleport(_withers.GetSpawn());
 
 		if (forced)
 		{
 			AddGems(player, 10, "Forced Wither", false, false);
 
-			Announce(F.main("Game", F.elem(_withers.GetColor() + player.getName()) + " has become a " + 
-					F.elem(_withers.GetColor() + newKit.GetName()) + "."));
+			Announce(F.main(
+					"Game",
+					F.elem(_withers.GetColor() + player.getName())
+							+ " has become a "
+							+ F.elem(_withers.GetColor() + newKit.GetName())
+							+ "."));
 
 			player.getWorld().strikeLightningEffect(player.getLocation());
 		}
 	}
-	
-//	@EventHandler
-//	public void playerLoseLife(final PlayerDeathOutEvent event)
-//	{
-//		Player player = event.GetPlayer();
-//
-//		if (_lives.containsKey(player))
-//		{
-//			int lives = _lives.get(player);
-//			
-//			if (lives <= 1)
-//				return;
-//				
-//			_lives.put(player, lives - 1);
-//
-//			UtilPlayer.message(player, F.main("Game", "You have " + F.elem(C.cGreen + C.Bold + lives + " Lives Remaining") + "."));
-//
-//			event.setCancelled(true);
-//		}
-//	}
-	
+
+	// @EventHandler
+	// public void playerLoseLife(final PlayerDeathOutEvent event)
+	// {
+	// Player player = event.GetPlayer();
+	//
+	// if (_lives.containsKey(player))
+	// {
+	// int lives = _lives.get(player);
+	//
+	// if (lives <= 1)
+	// return;
+	//
+	// _lives.put(player, lives - 1);
+	//
+	// UtilPlayer.message(player, F.main("Game", "You have " + F.elem(C.cGreen +
+	// C.Bold + lives + " Lives Remaining") + "."));
+	//
+	// event.setCancelled(true);
+	// }
+	// }
+
 	@EventHandler
 	public void gameStart(GameStateChangeEvent event)
 	{
 		if (event.GetState() != GameState.Live)
 			return;
-		
-		UtilTextMiddle.display(C.cGreen + "Humans Hiding", "15 Seconds until Assault", 10, 80, 10);
-		
+
+		UtilTextMiddle.display(C.cGreen + "Humans Hiding",
+				"15 Seconds until Assault", 10, 80, 10);
+
 		for (Player player : _withers.GetPlayers(true))
 		{
-			Manager.GetCondition().Factory().Blind("Game Start", player, null, 15, 0, false, false, false);
+			Manager.GetCondition()
+					.Factory()
+					.Blind("Game Start", player, null, 15, 0, false, false,
+							false);
 		}
 	}
-	
-//	@EventHandler
-//	public void playerLivesDisplay(PlayerKitGiveEvent event)
-//	{
-//		if (!_runners.HasPlayer(event.GetPlayer()))
-//			return;
-//		
-//		//Player Lives
-//		if (!_lives.containsKey(event.GetPlayer()))
-//			_lives.put(event.GetPlayer(), _livesPerPlayer);
-//			
-//		int lives = _lives.get(event.GetPlayer());
-//		
-//		if (lives <= 0)
-//			return;
-//		
-//		event.GetPlayer().getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, lives, C.cGreen + C.Bold + lives + " Lives Remaining"));
-//	}
+
+	// @EventHandler
+	// public void playerLivesDisplay(PlayerKitGiveEvent event)
+	// {
+	// if (!_runners.HasPlayer(event.GetPlayer()))
+	// return;
+	//
+	// //Player Lives
+	// if (!_lives.containsKey(event.GetPlayer()))
+	// _lives.put(event.GetPlayer(), _livesPerPlayer);
+	//
+	// int lives = _lives.get(event.GetPlayer());
+	//
+	// if (lives <= 0)
+	// return;
+	//
+	// event.GetPlayer().getInventory().setItem(8,
+	// ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, lives,
+	// C.cGreen + C.Bold + lives + " Lives Remaining"));
+	// }
 
 	@Override
 	public void EndCheck()
@@ -262,23 +271,23 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (!IsLive())
 			return;
 
-		//Players Quit
+		// Players Quit
 		if (GetPlayers(true).size() < 2)
 		{
 			SetState(GameState.End);
 		}
-		
+
 		GameTeam winner = null;
-		
-		//Wither Win
+
+		// Wither Win
 		if (UtilTime.elapsed(this.GetStateTime(), _gameTime))
 			winner = _runners;
-		
-		//Runner Win
+
+		// Runner Win
 		if (_runners.GetPlayers(true).isEmpty())
 			winner = _withers;
-		
-		//Set Win
+
+		// Set Win
 		if (winner != null)
 		{
 			AnnounceEnd(winner);
@@ -296,7 +305,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 						AddGems(player, 10, "Participation", false, false);
 			}
 
-			//End
+			// End
 			SetState(GameState.End);
 		}
 	}
@@ -307,33 +316,40 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	{
 		if (!InProgress())
 			return;
-		
+
 		if (event.getType() != UpdateType.FAST)
 			return;
-		
-//		int lives = 0;
-//		for (int i : _lives.values())
-//			lives += i;
 
-		//Wipe Last
+		// int lives = 0;
+		// for (int i : _lives.values())
+		// lives += i;
+
+		// Wipe Last
 		Scoreboard.Reset();
-		
+
 		Scoreboard.WriteBlank();
 		Scoreboard.Write(_runners.GetColor() + C.Bold + _runners.GetName());
-		Scoreboard.Write(_runners.GetColor() + "" + _runners.GetPlayers(true).size() + " Players");
-		
+		Scoreboard.Write(_runners.GetColor() + ""
+				+ _runners.GetPlayers(true).size() + " Players");
+
 		Scoreboard.WriteBlank();
 		Scoreboard.Write(_withers.GetColor() + C.Bold + _withers.GetName());
-		Scoreboard.Write(_withers.GetColor() + "" + _withers.GetPlayers(true).size() + " Players");
-		
-//		Scoreboard.WriteBlank();
-//		Scoreboard.Write(C.cYellow + C.Bold + "Humans Alive");
-//		Scoreboard.Write(lives + " / " + (_lives.size() * _livesPerPlayer));
-		
+		Scoreboard.Write(_withers.GetColor() + ""
+				+ _withers.GetPlayers(true).size() + " Players");
+
+		// Scoreboard.WriteBlank();
+		// Scoreboard.Write(C.cYellow + C.Bold + "Humans Alive");
+		// Scoreboard.Write(lives + " / " + (_lives.size() * _livesPerPlayer));
+
 		Scoreboard.WriteBlank();
 		Scoreboard.Write(C.cYellow + C.Bold + "Time Left");
-		Scoreboard.Write(UtilTime.MakeStr(Math.max(0, _gameTime - (System.currentTimeMillis() - this.GetStateTime())), 1));
-		
+		Scoreboard.Write(UtilTime.MakeStr(
+				Math.max(
+						0,
+						_gameTime
+								- (System.currentTimeMillis() - this
+										.GetStateTime())), 1));
+
 		Scoreboard.Draw();
 	}
 
@@ -345,7 +361,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		return _runners;
 	}
-	
+
 	@Override
 	public boolean CanJoinTeam(GameTeam team)
 	{
@@ -353,42 +369,42 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		{
 			return team.GetSize() < getRequiredWithers();
 		}
-			
+
 		return team.GetSize() < GetPlayers(true).size() - getRequiredWithers();
 	}
-	
+
 	public int getRequiredWithers()
 	{
-		return (int)(GetPlayers(true).size()/_witherFactor);
+		return (int) (GetPlayers(true).size() / _witherFactor);
 	}
-	
+
 	@EventHandler
 	public void witherMovement(UpdateEvent event)
 	{
 		if (!IsLive())
 			return;
-		
+
 		if (event.getType() != UpdateType.FASTER)
 			return;
-		
+
 		for (Player player : _withers.GetPlayers(true))
 		{
 			ArrayList<Location> collisions = new ArrayList<Location>();
-			
-			//Fly Speed
+
+			// Fly Speed
 			double speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006;
-			
+
 			if (speed > 0.16)
 				speed = 0.16;
-			
+
 			if (speed < 0.016)
 				speed = 0.016;
-			
-			player.setFlySpeed((float)speed);
-			
-			
-			//Bump
-			for (Block block : UtilBlock.getInRadius(player.getLocation().add(0, 0.5, 0), 1.5d).keySet())
+
+			player.setFlySpeed((float) speed);
+
+			// Bump
+			for (Block block : UtilBlock.getInRadius(
+					player.getLocation().add(0, 0.5, 0), 1.5d).keySet())
 			{
 				if (!UtilBlock.airFoliage(block))
 				{
@@ -396,15 +412,17 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 				}
 			}
 
-			Vector vec = UtilAlg.getAverageBump(player.getLocation(), collisions);
-			 
+			Vector vec = UtilAlg.getAverageBump(player.getLocation(),
+					collisions);
+
 			if (vec == null)
 				continue;
-			 
+
 			UtilAction.velocity(player, vec, 0.6, false, 0, 0.4, 10, true);
-			
-//			if (player.getLocation().getY() < _yLimit + 6)
-//				UtilAction.velocity(player, new Vector(0, 1, 0), 0.6, false, 0, 0, 10, true);
+
+			// if (player.getLocation().getY() < _yLimit + 6)
+			// UtilAction.velocity(player, new Vector(0, 1, 0), 0.6, false, 0,
+			// 0, 10, true);
 		}
 	}
 
@@ -412,139 +430,153 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	public void addBlocks(Set<Block> blocks)
 	{
 		Iterator<Block> blockIter = blocks.iterator();
-		
+
 		while (blockIter.hasNext())
 		{
 			Block block = blockIter.next();
-			
-			if (block.getType() == Material.BEDROCK || block.getType() == Material.IRON_BLOCK)
+
+			if (block.getType() == Material.BEDROCK
+					|| block.getType() == Material.IRON_BLOCK)
 				blockIter.remove();
-			
+
 			else if (!isInsideMap(block.getLocation()))
 				blockIter.remove();
-			
-//			else if (UtilAlg.inBoundingBox(block.getLocation(), _safeA, _safeB) || UtilAlg.inBoundingBox(block.getLocation(), _spawnA, _spawnB))
-//				blockIter.remove();
+
+			// else if (UtilAlg.inBoundingBox(block.getLocation(), _safeA,
+			// _safeB) || UtilAlg.inBoundingBox(block.getLocation(), _spawnA,
+			// _spawnB))
+			// blockIter.remove();
 		}
-		
+
 		for (Block block : blocks)
 			_blocks.add(new BlockData(block));
 	}
-	
+
 	@Override
 	public void restoreBlock(Location loc, double radius)
 	{
 		Iterator<BlockData> dataIt = _blocks.iterator();
-		
+
 		while (dataIt.hasNext())
 		{
 			BlockData data = dataIt.next();
-			
-			double dist = UtilMath.offset(loc, data.Block.getLocation().add(0.5, 0.5, 0.5));
-			
+
+			double dist = UtilMath.offset(loc,
+					data.Block.getLocation().add(0.5, 0.5, 0.5));
+
 			if (dist < radius)
 			{
-				Manager.GetBlockRestore().Add(data.Block, 0, (byte)0, data.Material.getId(), data.Data, (long) (6000 * (dist/radius)));
+				Manager.GetBlockRestore().Add(data.Block, 0, (byte) 0,
+						data.Material.getId(), data.Data,
+						(long) (6000 * (dist / radius)));
 				dataIt.remove();
 			}
 		}
 	}
 
-//	@EventHandler
-//	public void cleanLives(PlayerQuitEvent event)
-//	{
-//		_lives.remove(event.getPlayer());
-//	}
-	
-//	@EventHandler
-//	public void livesUpdate(UpdateEvent event)
-//	{
-//		if (!IsLive())
-//			return;
-//		
-//		if (event.getType() != UpdateType.FASTER)
-//			return;
-//		
-//		Iterator<Player> playerIter = _lives.keySet().iterator();
-//		
-//		while (playerIter.hasNext())
-//		{
-//			Player player = playerIter.next();
-//			
-//			if (!player.isOnline() || !_runners.HasPlayer(player))
-//				playerIter.remove();
-//		}
-//	}
-	
+	// @EventHandler
+	// public void cleanLives(PlayerQuitEvent event)
+	// {
+	// _lives.remove(event.getPlayer());
+	// }
+
+	// @EventHandler
+	// public void livesUpdate(UpdateEvent event)
+	// {
+	// if (!IsLive())
+	// return;
+	//
+	// if (event.getType() != UpdateType.FASTER)
+	// return;
+	//
+	// Iterator<Player> playerIter = _lives.keySet().iterator();
+	//
+	// while (playerIter.hasNext())
+	// {
+	// Player player = playerIter.next();
+	//
+	// if (!player.isOnline() || !_runners.HasPlayer(player))
+	// playerIter.remove();
+	// }
+	// }
+
 	@EventHandler
 	public void arrowDamage(CustomDamageEvent event)
 	{
 		if (event.GetProjectile() == null)
 			return;
-		
+
 		event.AddMult(GetName(), "Arrow Mod", 0.75, false);
-	}	
-	
+	}
+
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void damageOut(CustomDamageEvent event)
 	{
 		if (event.IsCancelled())
 			return;
-		
+
 		if (event.GetDamageePlayer() == null)
 			return;
-		
+
 		if (event.GetDamage() < event.GetDamageePlayer().getHealth())
 			return;
-		
+
 		event.SetCancelled("Fake Death");
-		
+
 		event.GetDamageePlayer().playEffect(EntityEffect.HURT);
-		
+
 		playerOut(event.GetDamageePlayer());
-		
+
 		if (event.GetDamagerPlayer(true) != null)
 		{
-			AddGems(event.GetDamagerPlayer(true), 2, "Humans Stunned", true, true);
-			
-			Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen + event.GetDamageePlayer().getName() + C.cGray + " was killed by " + C.cRed + event.GetDamagerPlayer(true).getName() + C.cGray + ".");
+			AddGems(event.GetDamagerPlayer(true), 2, "Humans Stunned", true,
+					true);
+
+			Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen
+					+ event.GetDamageePlayer().getName() + C.cGray
+					+ " was killed by " + C.cRed
+					+ event.GetDamagerPlayer(true).getName() + C.cGray + ".");
 		}
 		else
 		{
-			Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen + event.GetDamageePlayer().getName() + C.cGray + " was killed.");
+			Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen
+					+ event.GetDamageePlayer().getName() + C.cGray
+					+ " was killed.");
 		}
 	}
-	
+
 	public void playerOut(Player player)
 	{
-		//State
+		// State
 		SetPlayerState(player, PlayerState.OUT);
 		player.setHealth(20);
-		
+
 		player.setFlySpeed(0.1f);
 
-		//Conditions
-		Manager.GetCondition().Factory().Blind("Hit", player, player, 1.5, 0, false, false, false);
-		Manager.GetCondition().Factory().Cloak("Hit", player, player, 9999, false, false);
+		// Conditions
+		Manager.GetCondition().Factory()
+				.Blind("Hit", player, player, 1.5, 0, false, false, false);
+		Manager.GetCondition().Factory()
+				.Cloak("Hit", player, player, 9999, false, false);
 
-		//Settings
+		// Settings
 		player.setAllowFlight(true);
 		player.setFlying(true);
-		((CraftPlayer)player).getHandle().spectating = true;
-		((CraftPlayer)player).getHandle().k = false;
+		((CraftPlayer) player).getHandle().spectating = true;
+		((CraftPlayer) player).getHandle().k = false;
 
-		player.setVelocity(new Vector(0,1.2,0));
+		player.setVelocity(new Vector(0, 1.2, 0));
 
 		_doubles.put(player, new PlayerCopy(this, player, ChatColor.YELLOW));
 	}
-	
+
 	public void playerIn(final Player player, final LivingEntity copy)
 	{
-		//State
+		// State
 		SetPlayerState(player, PlayerState.IN);
 		player.setHealth(20);
 
-		//Teleport
+		// Teleport
 		if (copy != null)
 		{
 			Location loc = player.getLocation();
@@ -554,43 +586,49 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			player.teleport(loc);
 		}
 
-		//Settings
+		// Settings
 		player.setAllowFlight(false);
 		player.setFlying(false);
-		((CraftPlayer)player).getHandle().spectating = false;
-		((CraftPlayer)player).getHandle().k = true;
-		
-		//Items
+		((CraftPlayer) player).getHandle().spectating = false;
+		((CraftPlayer) player).getHandle().k = true;
+
+		// Items
 		player.getInventory().remove(Material.WATCH);
 		player.getInventory().remove(Material.COMPASS);
 
-		//Inform
+		// Inform
 		UtilPlayer.message(player, F.main("Game", "You have been revived!"));
 
-		//Delayed Visibility
+		// Delayed Visibility
 		if (copy != null)
 		{
-			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
-			{
-				public void run()
-				{
-					//Remove Invis
-					if (IsAlive(player))
-						Manager.GetCondition().EndCondition(player, ConditionType.CLOAK, null);
+			UtilServer
+					.getServer()
+					.getScheduler()
+					.scheduleSyncDelayedTask(Manager.getPlugin(),
+							new Runnable()
+							{
+								public void run()
+								{
+									// Remove Invis
+									if (IsAlive(player))
+										Manager.GetCondition().EndCondition(
+												player, ConditionType.CLOAK,
+												null);
 
-					//Remove Copy
-					copy.remove();
-				}
-			}, 4);
+									// Remove Copy
+									copy.remove();
+								}
+							}, 4);
 		}
 	}
-	
+
 	@EventHandler
 	public void revive(ProjectileHitEvent event)
 	{
 		if (!IsLive())
 			return;
-		
+
 		if (!(event.getEntity() instanceof ThrownPotion))
 			return;
 
@@ -600,12 +638,13 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (!(event.getEntity().getShooter() instanceof Player))
 			return;
 
-		Player thrower = (Player)event.getEntity().getShooter();
+		Player thrower = (Player) event.getEntity().getShooter();
 
 		GameTeam throwerTeam = GetTeam(thrower);
-		if (throwerTeam == null)	return;
+		if (throwerTeam == null)
+			return;
 
-		//Revive
+		// Revive
 		Iterator<PlayerCopy> copyIterator = _doubles.values().iterator();
 		while (copyIterator.hasNext())
 		{
@@ -615,7 +654,8 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			if (otherTeam == null || !otherTeam.equals(throwerTeam))
 				continue;
 
-			if (UtilMath.offset(copy.GetEntity().getLocation().add(0,1,0), event.getEntity().getLocation()) > 3)
+			if (UtilMath.offset(copy.GetEntity().getLocation().add(0, 1, 0),
+					event.getEntity().getLocation()) > 3)
 				continue;
 
 			playerIn(copy.GetPlayer(), copy.GetEntity());
@@ -624,30 +664,31 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			AddGems(thrower, 3, "Revived Ally", true, true);
 		}
 
-		//Revive
+		// Revive
 		for (Player player : GetPlayers(true))
 		{
 			GameTeam otherTeam = GetTeam(player);
 			if (otherTeam == null || !otherTeam.equals(throwerTeam))
 				continue;
 
-			if (UtilMath.offset(player.getLocation().add(0,1,0), event.getEntity().getLocation()) > 3)
+			if (UtilMath.offset(player.getLocation().add(0, 1, 0), event
+					.getEntity().getLocation()) > 3)
 				continue;
 
 			playerIn(player, null);
 		}
 	}
-	
+
 	@EventHandler
 	public void removePotionEffect(UpdateEvent event)
 	{
 		if (event.getType() != UpdateType.TICK)
 			return;
-		
+
 		for (Player player : GetPlayers(true))
 			player.removePotionEffect(PotionEffectType.WATER_BREATHING);
 	}
-	
+
 	@EventHandler
 	public void skeletonDamage(CustomDamageEvent event)
 	{
@@ -660,7 +701,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			}
 		}
 	}
-	
+
 	@EventHandler
 	public void skeletonCombust(EntityCombustEvent event)
 	{

From 558b71f866a5d9aa723848adc8bcf9682c8d0a5d Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 11:48:14 +1000
Subject: [PATCH 020/113] fixed thigny

---
 .../mineplex/minecraft/game/classcombat/Class/ClientClass.java  | 2 +-
 .../nautilus/game/arcade/game/games/skywars/TeamSkywars.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
index ae8816f3a..e892c5f75 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
@@ -341,7 +341,7 @@ public class ClientClass
 		if (notify)
 		{
 			ListSkills(_client.GetPlayer());
-			_client.GetPlayer().getWorld().playSound(_client.GetPlayer().getLocation(), Sound.LEVEL_UP, 1f, 1f);
+			_client.GetPlayer().playSound(_client.GetPlayer().getLocation(), Sound.LEVEL_UP, 1f, 1f);
 
 			_client.GetPlayer().sendMessage(F.main("Class", "You equipped " + F.skill(customBuild.Name) + "."));
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 3a372bdd5..441278a2d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -125,7 +125,7 @@ public class TeamSkywars extends Skywars
 	
 	private BlockFace getBlockface(BlockFace face) 
 	{
-		for(TeamColors faces : TeamColors.values()) {
+		for(BlockFace faces : BlockFace.values()) {
 			if(faces.ordinal() == face.ordinal() + 1)
 			{	
 				return face;

From 3335a7c288c99e5dd4ab8322b81cea31befaa0e2 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 12:07:09 +1000
Subject: [PATCH 021/113] changed skywars teams. forced at 16 teams.

---
 .../game/games/skywars/TeamSkywars.java       | 121 +++++++-----------
 1 file changed, 49 insertions(+), 72 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 441278a2d..63414d069 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.updater.UpdateType;
@@ -22,11 +23,6 @@ import org.bukkit.event.EventHandler;
 
 public class TeamSkywars extends Skywars
 {
-
-	public boolean ForceTeamSize = true;
-	public int PlayersPerTeam = 2;
-	public int TeamCount = 0;
-
 	public TeamSkywars(ArcadeManager manager)
 	{
 		super(manager, GameType.SkywarsTeams, 
@@ -36,9 +32,6 @@ public class TeamSkywars extends Skywars
 					"Craft or loot gear for combat",
 					"Last team alive wins!"
 							});
-		
-		this.PlayersPerTeam = 2;
-		
 	}
 	
 	@EventHandler
@@ -47,82 +40,66 @@ public class TeamSkywars extends Skywars
 		if (event.GetState() != GameState.Recruit)
 			return;
 		
-		ArrayList<Location> tempSpawns = this.GetTeamList().get(0).GetSpawns();
+		ArrayList<Location> initialSpawns = this.GetTeamList().get(0).GetSpawns();
 		this.GetTeamList().clear();
 		
 		ArrayList<Location> spawns = new ArrayList<Location>();
-		for(Location location : tempSpawns)
+		
+		TeamColors color = TeamColors.DARK_AQUA;
+		
+		//Create 1 Team for each Spawn
+		int i = 0;
+		for(Location location : initialSpawns)
 		{
-			for(int x = -1; x <= 1; x++)
+			i++;
+			
+			spawns.add(location);
+			
+			addRelativeSpawns(spawns, location);
+			
+			//Got Spawns
+			color = getNextColor(color);
+			GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+			team.SetVisible(true);
+			GetTeamList().add(team);	
+		}
+	}
+	
+	private void addRelativeSpawns(ArrayList<Location> spawns,	Location location)
+	{
+		//Gather Extra Spawns
+		for(int x = -1; x <= 1; x++)
+		{
+			for(int z = -1; z <= 1; z++)
 			{
-				for(int z = -1; z <= 1; z++)
+				if(x != 0 && z != 0)
 				{
-					if(x != 0 && z != 0)
+					Location newSpawn = location.clone().add(x, 0, z);
+					
+					//Search Downward for Solid
+					while (UtilBlock.airFoliage(newSpawn.getBlock().getRelative(BlockFace.DOWN)) && newSpawn.getY() > location.getY()-5)
 					{
-						Location spawnLocation = location.clone().add(x, 0, z);
-						if(spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(BlockFace.DOWN).getType() == Material.AIR)
-						{
-							boolean foundBlock = false;
-							Location tempLocation = spawnLocation.clone();
-							BlockFace currentBlockFace = BlockFace.NORTH; 
-							while(!foundBlock)
-							{
-								for(BlockFace face : BlockFace.values())
-								{
-									if(spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(face).getType() != Material.AIR)
-									{
-										spawnLocation = tempLocation.getWorld().getBlockAt(tempLocation).getRelative(face).getLocation().add(0, 1, 0);
-										foundBlock = true;
-									}
-								}
-								if(!foundBlock)
-								{
-									tempLocation = spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(currentBlockFace).getLocation();
-									currentBlockFace = getBlockface(currentBlockFace);
-									if(currentBlockFace == BlockFace.SELF)
-									{
-										currentBlockFace = getBlockface(currentBlockFace);			
-										tempLocation = spawnLocation.getWorld().getBlockAt(spawnLocation).getRelative(currentBlockFace).getLocation();
-										spawnLocation = tempLocation;
-									}
-								}
-							}
-						}
-						while(spawnLocation.getWorld().getBlockAt(spawnLocation).getType() != Material.AIR)
-						{
-							spawnLocation.add(0, 1, 0);
-						}
-						spawns.add(spawnLocation);
+						newSpawn.subtract(0, 1, 0);
+					}
+					
+					//Move Up out of Solid
+					while (!UtilBlock.airFoliage(newSpawn.getBlock()) && newSpawn.getY() < location.getY()+5)
+					{
+						newSpawn.add(0, 1, 0);
+					}
+					
+					//On Solid, with 2 Air Above
+					if (UtilBlock.airFoliage(newSpawn.getBlock()) &&
+						UtilBlock.airFoliage(newSpawn.getBlock().getRelative(BlockFace.UP)) &&
+						!UtilBlock.airFoliage(newSpawn.getBlock().getRelative(BlockFace.DOWN)))
+					{
+						spawns.add(newSpawn);
 					}
 				}
 			}
 		}
-		
-		TeamColors color = TeamColors.DARK_AQUA;
-		
-		if(!this.ForceTeamSize) 
-		{
-			for(int i = 1; i <= this.TeamCount; i++)
-			{
-				color = getNextColor(color);
-				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
-				team.SetVisible(true);
-				GetTeamList().add(team);
-			}
-		}
-		else 
-		{
-			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
-			{
-				System.out.println("Test");
-				color = getNextColor(color);
-				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
-				team.SetVisible(true);
-				GetTeamList().add(team);
-			}
-		}
 	}
-	
+
 	private BlockFace getBlockface(BlockFace face) 
 	{
 		for(BlockFace faces : BlockFace.values()) {

From 63f6adf2959de26b5c38b03bc7c934bd4dc19d21 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 12:50:34 +1000
Subject: [PATCH 022/113] fixed spawn picking

---
 .../mineplex/core/common/util/UtilAlg.java    |  93 +++++++++++++++
 .../src/nautilus/game/arcade/game/Game.java   |   1 +
 .../nautilus/game/arcade/game/GameTeam.java   | 108 ++++++------------
 .../games/survivalgames/SurvivalGames.java    |   1 +
 4 files changed, 129 insertions(+), 74 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
index fad8f1eef..d686faa2d 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
@@ -7,6 +7,7 @@ import java.util.TreeSet;
 
 
 
+
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -260,4 +261,96 @@ public class UtilAlg
 		return isInPyramid(player.getLocation().getDirection(), UtilAlg.getTrajectory(player.getEyeLocation(), target.getEyeLocation()), angleLimit) ||
 				isInPyramid(player.getLocation().getDirection(), UtilAlg.getTrajectory(player.getEyeLocation(), target.getLocation()), angleLimit);
 	}
+
+	public static Location getLocationAwayFromPlayers(ArrayList<Location> locs, ArrayList<Player> players) 
+	{
+		Location bestLoc = null;
+		double bestDist = 0;
+		
+		for (Location loc : locs)
+		{
+			double closest = -1;
+			
+			for (Player player : players)
+			{
+				//Different Worlds
+				if (!player.getWorld().equals(loc.getWorld()))
+					continue;
+				
+				double dist = UtilMath.offsetSquared(player.getLocation(), loc);
+				
+				if (closest == -1 || dist < closest)
+				{
+					closest = dist;
+				}
+			}
+			
+			if (closest == -1)
+				continue;
+						
+			if (bestLoc == null || closest > bestDist)
+			{
+				bestLoc = loc;
+				bestDist = closest;
+			}
+		}
+		
+		return bestLoc;
+	}
+	
+	public static Location getLocationNearPlayers(ArrayList<Location> locs, ArrayList<Player> players, ArrayList<Player> dontOverlap) 
+	{
+		Location bestLoc = null;
+		double bestDist = 0;
+		
+		for (Location loc : locs)
+		{
+			double closest = -1;
+			
+			boolean valid = true;
+			
+			//Dont spawn on other players
+			for (Player player : dontOverlap)
+			{
+				if (!player.getWorld().equals(loc.getWorld()))
+					continue;
+				
+				double dist = UtilMath.offsetSquared(player.getLocation(), loc);
+			
+				if (dist < 0.8)
+				{
+					valid = false;
+					break;
+				}
+			}
+			
+			if (!valid)
+				continue;
+			
+			//Find closest player
+			for (Player player : players)
+			{
+				if (!player.getWorld().equals(loc.getWorld()))
+					continue;
+				
+				double dist = UtilMath.offsetSquared(player.getLocation(), loc);
+				
+				if (closest == -1 || dist < closest)
+				{
+					closest = dist;
+				}
+			}
+			
+			if (closest == -1)
+				continue;
+			
+			if (bestLoc == null || closest < bestDist)
+			{
+				bestLoc = loc;
+				bestDist = closest;
+			}
+		}
+		
+		return bestLoc;
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 7a413d04a..c59fc2353 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -210,6 +210,7 @@ public abstract class Game implements Listener
 	public int TickPerTeleport = 1;
 	
 	public boolean SpawnNearAllies = false;
+	public boolean SpawnNearEnemies = false;
 	
 	public boolean StrictAntiHack = false;
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index dee18f3d2..bc6940d90 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -7,6 +7,7 @@ import java.util.Iterator;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
@@ -97,88 +98,47 @@ public class GameTeam
 
 	public Location GetSpawn() 
 	{	
-		//Spawn Allies Together!
-		if (Host.IsLive() && Host.SpawnNearAllies)
+		//Keep allies together
+		if (!Host.IsLive() && Host.SpawnNearAllies)
 		{
-			Location closestLoc = null;
-			double closestDist = 0;
-
-			for (Location loc : _spawns)
+			//Find Location Nearest Ally
+			Location loc = UtilAlg.getLocationNearPlayers(_spawns, GetPlayers(true), Host.GetPlayers(true));
+			if (loc != null)
+				return loc;
+				
+			//No allies existed spawned yet
+			
+			//Spawn near enemies (used for SG)
+			if (Host.SpawnNearEnemies)
 			{
-				//Check if Location is closer!
-				for (Player player : this.GetPlayers(true))
-				{
-					//Different Worlds
-					if (!player.getWorld().equals(loc.getWorld()))
-						continue;
-					
-					double dist = UtilMath.offset(player.getLocation(), loc);
-					
-					//Dont Spawn Inside Ally
-					if (dist < 0.75)
-						continue;
-					
-					//Find Closest Enemy
-					double closestEnemy = -1;
-					
-					for (Player enemy : Host.GetPlayers(true))
-					{
-						if (!enemy.getWorld().equals(loc.getWorld()))
-							continue;
-						
-						if (this.HasPlayer(enemy))
-							continue;
-						
-						double enemyDist = UtilMath.offset(player.getLocation(), loc);
-						
-						if (closestEnemy == -1 || enemyDist < closestEnemy)
-						{
-							closestEnemy = enemyDist;
-						}
-					}
-					
-					//Dont Spawn Inside Enemy
-					if (closestEnemy != -1 && closestEnemy < 0.75)
-						continue;
-					
-					//Good Location!
-					if (closestLoc == null || dist < closestDist)
-					{
-						closestLoc = loc;
-						closestDist = dist;
-					}
-				}	
+				loc = UtilAlg.getLocationNearPlayers(_spawns, Host.GetPlayers(true), Host.GetPlayers(true));
+				if (loc != null)
+					return loc;
 			}
-
-			if (closestLoc != null)
-				return closestLoc;
+			//Spawn away from enemies
+			else
+			{
+				loc = UtilAlg.getLocationAwayFromPlayers(_spawns, Host.GetPlayers(true));
+				if (loc != null)
+					return loc;
+			}			
 		}
-		//Spawn Furthest Away!
 		else
 		{
-			Location furthestLoc = null;
-			double furthestDist = 0;
-
-			for (Location loc : _spawns)
+			//Spawn near players 
+			if (Host.SpawnNearEnemies)
 			{
-				for (Player player : Host.GetPlayers(true))
-				{
-					//Different Worlds
-					if (!player.getWorld().equals(loc.getWorld()))
-						continue;
-					
-					double dist = UtilMath.offsetSquared(player.getLocation(), loc);
-
-					if (furthestLoc == null || dist > furthestDist)
-					{
-						furthestLoc = loc;
-						furthestDist = dist;
-					}
-				}
+				Location loc = UtilAlg.getLocationAwayFromPlayers(_spawns, Host.GetPlayers(true));
+				if (loc != null)
+					return loc;
+			}
+			//Spawn away from players
+			else
+			{
+				Location loc = UtilAlg.getLocationNearPlayers(_spawns, Host.GetPlayers(true), Host.GetPlayers(true));
+				if (loc != null)
+					return loc;
 			}
-
-			if (furthestLoc != null)
-				return furthestLoc;
 		}
 
 		return _spawns.get(UtilMath.r(_spawns.size()));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 64d9fa498..4cd409f62 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -218,6 +218,7 @@ public abstract class SurvivalGames extends Game
 		WorldBoundaryKill = false;
 
 		SpawnNearAllies = true;
+		SpawnNearEnemies = true; //This is to ensure theres no 'gaps' of 1 between teams, hence forcing a team to get split.
 
 		DamageSelf = true;
 		DamageTeamSelf = true;

From cfb4911c25ce742cc4efe3d83000027164d34a48 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 12:54:53 +1000
Subject: [PATCH 023/113] added ability for teams will fill before moving onto
 next team

---
 .../src/nautilus/game/arcade/game/Game.java         | 13 +++++++++++++
 .../arcade/game/games/smash/TeamSuperSmash.java     |  2 +-
 .../game/games/survivalgames/TeamSurvivalGames.java |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index c59fc2353..24c3fe27d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -209,6 +209,8 @@ public abstract class Game implements Listener
 	
 	public int TickPerTeleport = 1;
 	
+	public int EnforceTeamSize = -1;
+	
 	public boolean SpawnNearAllies = false;
 	public boolean SpawnNearEnemies = false;
 	
@@ -614,6 +616,17 @@ public abstract class Game implements Listener
 
 	public GameTeam ChooseTeam(Player player)
 	{
+		if (EnforceTeamSize != -1)
+		{
+			for (int i = 0; i < _teamList.size(); i++)
+			{
+				if (_teamList.get(i).GetSize() < EnforceTeamSize)
+				{
+					return _teamList.get(i);
+				}
+			}
+		}
+		
 		GameTeam team = null;
 
 		//Random Team
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 6c2d0cffe..1b096c267 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -33,6 +33,7 @@ public class TeamSuperSmash extends SuperSmash
 						});
 		
 		this.PlayersPerTeam = 2;
+		this.EnforceTeamSize = 2;
 	}
 
 	@Override
@@ -213,5 +214,4 @@ public class TeamSuperSmash extends SuperSmash
 
 		return players;
 	}
-	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index e2dbcbbb7..0f0d3ca73 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -37,6 +37,7 @@ public class TeamSurvivalGames extends SurvivalGames
 								});
 		
 		this.PlayersPerTeam = 2;
+		this.EnforceTeamSize = 2;
 		
 	}
 	

From 44102842c9df2e4df24aec7430687f730da2cbd2 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 13:27:55 +1000
Subject: [PATCH 024/113] added some velocity debug

---
 .../src/mineplex/core/common/util/UtilAction.java      | 10 +++++++++-
 .../minecraft/game/core/damage/DamageManager.java      |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index 1b870ada9..ab1814725 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -1,7 +1,9 @@
 package mineplex.core.common.util;
 
 
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 public class UtilAction
@@ -37,6 +39,12 @@ public class UtilAction
 		
 		//Velocity
 		ent.setFallDistance(0);
-		ent.setVelocity(vec);		
+		ent.setVelocity(vec);	
+		
+		//Debug
+		if (ent instanceof Player && UtilGear.isMat(((Player)ent).getItemInHand(), Material.SUGAR))
+		{
+			UtilPlayer.message(ent, F.main("Debug", "Velocity Sent: " + vec.length()));
+		}	
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
index aab72ed1e..8e052c32d 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
@@ -391,10 +391,11 @@ public class DamageManager extends MiniPlugin
 				trajectory.setY(Math.abs(trajectory.getY()));
 
 				//Apply
-				UtilAction.velocity(event.GetDamageeEntity(), 
-						trajectory, 0.2 + trajectory.length() * 0.8, false, 0, Math.abs(0.2 * knockback), 0.4 + (0.04 * knockback), true);	
+				double vel = 0.2 + trajectory.length() * 0.8;
+				
+				UtilAction.velocity(event.GetDamageeEntity(), trajectory, vel, 
+						false, 0, Math.abs(0.2 * knockback), 0.4 + (0.04 * knockback), true);
 			}
-
 		}
 		catch (IllegalAccessException e)
 		{
@@ -414,7 +415,7 @@ public class DamageManager extends MiniPlugin
 	{
 		for (Player player : UtilServer.getPlayers())
 		{
-			if (!UtilGear.isMat(player.getItemInHand(), Material.BOOK))
+			if (!UtilGear.isMat(player.getItemInHand(), Material.COMMAND))
 				continue;
 
 			UtilPlayer.message(player, " ");

From aaae11d42685cd00750fb40a95a2d66b4398db26 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 17 Jul 2015 06:29:32 +0200
Subject: [PATCH 025/113] Git Fix.

---
 .../game/arcade/game/games/survivalgames/SurvivalGames.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 64d9fa498..7010923e1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -216,7 +216,6 @@ public abstract class SurvivalGames extends Game
 
 		WorldTimeSet = 0;
 		WorldBoundaryKill = false;
-
 		SpawnNearAllies = true;
 
 		DamageSelf = true;

From 02a71bff68c81e342678553762070a1ae819a64f Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 17 Jul 2015 06:30:53 +0200
Subject: [PATCH 026/113] another git fix

---
 .../src/nautilus/game/arcade/GameType.java    |    5 +-
 .../arcade/game/games/skywars/Skywars.java    |    2 +-
 .../survivalgames/SurvivalGamesTeams.java     | 1644 +++++++++++++++++
 .../arcade/managers/GameCreationManager.java  |    1 +
 4 files changed, 1648 insertions(+), 4 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 7a844b70b..5b3ad41fd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -115,7 +115,6 @@ public enum GameType
 	WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
 	Wizards(Wizards.class, GameDisplay.Barbarians.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
 	ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
-	
 	Build(Build.class, GameDisplay.Build),
 	Cards(Cards.class, GameDisplay.Cards),
 	Skywars(SoloSkywars.class, GameDisplay.Skywars),
@@ -128,9 +127,9 @@ public enum GameType
 		GameType.Draw, GameType.Evolution, GameType.Gravity, GameType.Halloween, GameType.HideSeek,
 		GameType.HoleInTheWall, GameType.Horse, GameType.Micro, GameType.MilkCow, GameType.MineStrike, GameType.MineWare,
 		GameType.OldMineWare, GameType.Paintball, GameType.Quiver, GameType.QuiverTeams, GameType.Runner, GameType.SearchAndDestroy,
-		GameType.Sheep, GameType.Skywars, /*GameType.SkywarsTeams,*/ GameType.Smash, GameType.SmashDomination, /*GameType.SmashTeams,*/
+		GameType.Sheep, GameType.Skywars, GameType.SkywarsTeams, GameType.Smash, GameType.SmashDomination, GameType.SmashTeams,
 		GameType.Snake, GameType.SneakyAssassins, GameType.SnowFight, GameType.Spleef, GameType.SpleefTeams, GameType.SquidShooter,
-		GameType.Stacker, GameType.SurvivalGames, /*GameType.SurvivalGamesTeams,*/ GameType.Tug, GameType.TurfWars, GameType.UHC,
+		GameType.Stacker, GameType.SurvivalGames, GameType.SurvivalGamesTeams, GameType.Tug, GameType.TurfWars, GameType.UHC,
 		GameType.WitherAssault, GameType.Wizards, GameType.ZombieSurvival}, true);
 
 	GameDisplay _display;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index 0d2e6a08b..593b185ed 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -156,7 +156,7 @@ public abstract class Skywars extends Game
 
 		WorldTimeSet = 0;	
 		WorldBoundaryKill = false;
-
+		
 		SpawnNearAllies = true;
 
 		DamageSelf = true;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
new file mode 100644
index 000000000..049b93826
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
@@ -0,0 +1,1644 @@
+package nautilus.game.arcade.game.games.survivalgames;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.MapUtil;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilFirework;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.common.util.UtilWorld;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.core.visibility.VisibilityManager;
+import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.TeamGame;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitArcher;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitAssassin;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitAxeman;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitBeastmaster;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitBomber;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitBrawler;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitHorseman;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitKnight;
+import nautilus.game.arcade.game.games.survivalgames.kit.KitLooter;
+import nautilus.game.arcade.kit.Kit;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.Effect;
+import org.bukkit.FireworkEffect;
+import org.bukkit.FireworkEffect.Type;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.Chest;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Snowball;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.event.hanging.HangingBreakEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.util.Vector;
+
+public class SurvivalGamesTeams extends TeamGame
+{
+	private HashSet<Location> _openedChest = new HashSet<Location>();
+	private ArrayList<ItemStack> _baseChestLoot = new ArrayList<ItemStack>();
+	private ArrayList<ItemStack> _superChestLoot = new ArrayList<ItemStack>();
+
+	//Misc
+	private HashMap<Entity, Player> _tntMap = new HashMap<Entity, Player>();
+	private HashSet<Location> _placedBlocks = new HashSet<Location>();
+	private Location _spawn;
+
+	//Creep
+	private int _maxSpreadRate = 120;
+	private ArrayList<Location> _redLocations = new ArrayList<Location>();
+	private int _spreadType = 0;
+	private String _spreadName = "";
+	private boolean _ignoreLiquids = true;
+	private ArrayList<Entry<Integer, Integer>> _spreadTypeBlocks;
+	private HashMap<Player, Long> _redOutTime = new HashMap<Player, Long>();
+
+	private HashMap<Integer, HashMap<Integer, HashSet<Integer>>> _redMap = new HashMap<Integer, HashMap<Integer, HashSet<Integer>>>();
+	private HashMap<Player, ArrayList<ChunkChange>> _redChunks = new HashMap<Player, ArrayList<ChunkChange>>();
+
+	//Supply Drop
+	private ArrayList<Location> _supplyLocations = new ArrayList<Location>();
+	private Location _supplyCurrent = null;
+	private Location _supplyEffect = null;
+	private ArrayList<Block> _supplyChests = new ArrayList<Block>();
+
+	//Deathmatch
+	private boolean _deathmatchCountdown = false;
+	private boolean _deathmatchLive = false;
+	private long _deathmatchTime = 0;
+
+	//Debug
+	private long totalTime = 0;
+
+	public SurvivalGamesTeams(ArcadeManager manager) 
+	{
+		super(manager, GameType.SurvivalGames,
+
+				new Kit[]
+						{
+				new KitAxeman(manager),
+				//new KitLooter(manager),
+				new KitKnight(manager),
+
+				new KitArcher(manager),
+				new KitBrawler(manager),
+
+				new KitAssassin(manager),
+				new KitBeastmaster(manager),
+				new KitBomber(manager),
+				//new KitNecromancer(manager),
+				
+				new KitHorseman(manager)
+						},
+
+						new String[]
+								{
+				"Search for chests to find loot",
+				"Slaughter your opponents",
+				"Stay away from the Deep Freeze!",
+				"Last team alive wins!"
+								});
+		
+		_help = new String[] 
+				{
+				C.cGreen + "Use a Compass to find and kill enemies!",
+				C.cAqua + "Crouch to become invisible to Compass tracking!",
+				C.cGreen + "Avoid the Deep Freeze at all costs!",
+				C.cAqua + "Use TNT & Tripwires to make traps!",
+				C.cGreen + "You lose Speed 2 at start of game if you attack.",
+				C.cAqua + "Avoid enemies who have better gear than you!",
+				C.cGreen + "Compass finds Supply Drops during night time.",
+				C.cAqua + "Compass finds Players during day time.",
+				};
+
+		setItemMerge(true);
+//		Manager.GetAntiStack().SetEnabled(false);
+
+		this.GameTimeout = 9600000;
+		
+		this.WorldTimeSet = 0;
+		this.WorldBoundaryKill = false; 
+		
+
+		this.DamageSelf = true;
+		this.DamageTeamSelf = false;
+
+		this.DeathDropItems = true;
+
+		this.ItemDrop = true;
+		this.ItemPickup = true;
+
+		this.CompassEnabled = false; //XXX
+		
+		this.InventoryClick = true;
+		this.InventoryOpenBlock = true;
+		this.InventoryOpenChest = true;
+
+		//Blocks
+		this.BlockBreakAllow.add(46);	//TNT
+		this.BlockPlaceAllow.add(46);
+
+		this.BlockBreakAllow.add(30);	//Web
+		this.BlockPlaceAllow.add(30);
+
+		this.BlockBreakAllow.add(132); 	//Tripwire
+		this.BlockPlaceAllow.add(132);
+
+		this.BlockBreakAllow.add(131);	//Wire Hook
+		this.BlockPlaceAllow.add(131);
+
+		this.BlockBreakAllow.add(55);	//Redstone Dust
+		this.BlockPlaceAllow.add(55);
+
+		this.BlockBreakAllow.add(72);	//Wood Pressure Plate
+		this.BlockPlaceAllow.add(72);
+
+		this.BlockBreakAllow.add(69);	//Lever
+		this.BlockPlaceAllow.add(69);
+
+		this.BlockBreakAllow.add(18);	//Leaves
+
+		//SPREAD
+		_spreadType = 1;//UtilMath.r(3);
+
+		_spreadTypeBlocks = new ArrayList<Entry<Integer, Integer>>();
+
+		if (_spreadType == 0)
+		{
+			_spreadName = "Red";
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(159, 14));
+		}
+		else if (_spreadType == 1)
+		{
+			_spreadName = "Deep Freeze";
+			_ignoreLiquids = false;
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(78, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(79, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(80, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(49, 0));
+		}
+		else if (_spreadType == 2)
+		{
+			_spreadName = "Nether Corruption";
+			_ignoreLiquids = false;
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(49, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(87, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(88, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(89, 0));
+			_spreadTypeBlocks.add(new AbstractMap.SimpleEntry<Integer, Integer>(153, 0));
+		}
+
+		System.out.println("===================");
+		System.out.println("CREEP TYPE: " + _spreadName);
+		System.out.println("===================");
+		//Manager.GetStatsManager().addTable(GetName(), "kills", "deaths", "chestsOpened");
+		
+		//Tournament
+		if (Manager.IsTournamentServer())
+			QuitOut = false;
+	}
+
+	@Override
+	public double GetKillsGems(Player killer, Player killed, boolean assist)
+	{
+		return 4;
+	}
+
+	@Override
+	public void ParseData() 
+	{
+		ArrayList<Location> allSpawns = new ArrayList<Location>();
+		for (GameTeam team : GetTeamList())
+			allSpawns.addAll(team.GetSpawns());
+		
+		_spawn = UtilWorld.averageLocation(allSpawns);
+
+		for (Location loc : allSpawns)
+			loc.setYaw(UtilAlg.GetYaw(UtilAlg.getTrajectory(loc, _spawn)));
+
+		CreateChestCraftEnchant();
+
+		_supplyLocations = WorldData.GetDataLocs("WHITE");
+		for (Location loc : _supplyLocations)
+			loc.getBlock().setType(Material.GLASS);
+
+		if (!WorldData.GetCustomLocs("VARS").isEmpty())
+		{
+			_maxSpreadRate = WorldData.GetCustomLocs("VARS").get(0).getBlockX();
+			System.out.println("Spread Rate: " + _maxSpreadRate);
+		}
+	}
+
+	private void CreateChestCraftEnchant() 
+	{
+		ArrayList<Location> chests = WorldData.GetCustomLocs("54");
+
+		System.out.println("Map Chest Locations: " + chests.size());
+
+		//Enchants
+		System.out.println("Enchanting Tables: " + Math.min(5, chests.size()));
+		for (int i=0 ; i<5 && !chests.isEmpty() ; i++)
+		{
+			Location loc = chests.remove(UtilMath.r(chests.size()));		
+			loc.getBlock().setType(Material.ENCHANTMENT_TABLE);
+		}
+
+		//Crafting
+		System.out.println("Crafting Benches: " + Math.min(10, chests.size()));
+		for (int i=0 ; i<10 && !chests.isEmpty() ; i++)
+		{
+			Location loc = chests.remove(UtilMath.r(chests.size()));		
+			loc.getBlock().setType(Material.WORKBENCH);
+		}
+
+		int spawn = 0;
+
+		//Chests
+		System.out.println("Chests: " + Math.min(250, chests.size()));
+		for (int i=0 ; i<250 && !chests.isEmpty() ; i++)
+		{
+			Location loc = chests.remove(UtilMath.r(chests.size()));	
+
+			if (UtilMath.offset2d(loc, _spawn) < 8)
+				spawn++;
+		}
+
+		for (Location loc : chests)
+		{
+			if (spawn < 10 && UtilMath.offset(loc, _spawn) < 8)
+			{
+				spawn++;
+				continue;
+			}
+
+			loc.getBlock().setType(Material.AIR);
+		}
+	}
+
+	@EventHandler
+	public void CreateRandomChests(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+			return;
+
+		HashSet<Material> ignore = new HashSet<Material>();
+
+		ignore.add(Material.LEAVES);
+
+		int xDiff = WorldData.MaxX - WorldData.MinX;
+		int zDiff = WorldData.MaxZ - WorldData.MinZ;
+
+		int done = 0;
+
+		while (done < 40)
+		{
+
+			Block block = UtilBlock.getHighest(WorldData.World, WorldData.MinX + UtilMath.r(xDiff), WorldData.MinZ + UtilMath.r(zDiff), ignore);
+
+			if (!UtilBlock.airFoliage(block) || !UtilBlock.solid(block.getRelative(BlockFace.DOWN)))
+				continue;
+
+			block.setTypeIdAndData(54, (byte)UtilMath.r(4), true);
+			done++;
+		}
+	}
+
+	@EventHandler
+	private void OpenChest(PlayerInteractEvent event)
+	{
+		if (event.isCancelled())
+			return;
+
+		if (event.getClickedBlock() == null)
+			return;
+
+		if (!(event.getClickedBlock().getState() instanceof Chest))
+			return;
+
+		if (GetState() != GameState.Live)
+			return;
+
+		if (_openedChest.contains(event.getClickedBlock().getLocation()))
+			return;
+
+		_openedChest.add(event.getClickedBlock().getLocation());
+
+		Chest chest = (Chest)event.getClickedBlock().getState();
+
+		chest.getBlockInventory().clear();
+
+		int count = 2;
+		if (Math.random() > 0.50)			count++;	
+		if (Math.random() > 0.65)			count++;	
+		if (Math.random() > 0.80)			count++;	
+		if (Math.random() > 0.95)			count++;
+
+		if (UtilMath.offset(chest.getLocation(), _spawn) < 8)
+			count += 3;
+
+		if (GetKit(event.getPlayer()) instanceof KitLooter)
+		{
+			count += UtilMath.r(3);
+		}
+
+		if (_supplyChests.contains(event.getClickedBlock()))
+		{
+			count = 2;	
+			if (Math.random() > 0.75)			count++;
+			if (Math.random() > 0.95)			count++;
+		}
+
+		for (int i = 0; i < count; i++) 
+			chest.getBlockInventory().setItem(UtilMath.r(27), GetChestItem(_supplyChests.contains(event.getClickedBlock())));
+
+		_supplyChests.remove(event.getClickedBlock());
+
+		Bukkit.getPluginManager().callEvent(new SupplyChestOpenEvent(event.getPlayer(), event.getClickedBlock()));
+	}
+
+	private ItemStack GetChestItem(boolean superChest)
+	{
+		if (_baseChestLoot.isEmpty()) 
+		{
+			//Armor
+			for (int i = 0; i < 10; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_HELMET));
+			for (int i = 0; i < 3; i++)				_baseChestLoot.add(new ItemStack(Material.IRON_CHESTPLATE));
+			for (int i = 0; i < 5; i++)				_baseChestLoot.add(new ItemStack(Material.IRON_LEGGINGS));
+			for (int i = 0; i < 10; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_BOOTS));
+
+			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_HELMET));
+			for (int i = 0; i < 20; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_CHESTPLATE));
+			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_LEGGINGS));
+			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.CHAINMAIL_BOOTS));
+
+			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_HELMET));
+			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_CHESTPLATE));
+			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_LEGGINGS));
+			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_BOOTS));
+
+			for (int i = 0; i < 100; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_HELMET));
+			for (int i = 0; i < 90; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_CHESTPLATE));
+			for (int i = 0; i < 85; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_LEGGINGS));
+			for (int i = 0; i < 100; i++)			_baseChestLoot.add(new ItemStack(Material.LEATHER_BOOTS));
+
+			//Weapons
+			for (int i = 0; i < 70; i++)			_baseChestLoot.add(new ItemStack(Material.WOOD_AXE));
+			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_AXE));
+			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.STONE_AXE));
+			for (int i = 0; i < 15; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_AXE));
+
+			for (int i = 0; i < 60; i++)			_baseChestLoot.add(new ItemStack(Material.WOOD_SWORD));
+			for (int i = 0; i < 35; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_SWORD));			
+			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.STONE_SWORD));
+			for (int i = 0; i < 8; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_SWORD));
+
+			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.BOW));
+			for (int i = 0; i < 55; i++)			_baseChestLoot.add(new ItemStack(Material.ARROW, 4));
+
+			for (int i = 0; i < 15; i++)			_baseChestLoot.add(new ItemStack(Material.TNT, 1));
+			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.WEB, 2));
+
+			//Food
+			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.MUSHROOM_SOUP));
+			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.COOKED_CHICKEN, 5));
+			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.RAW_BEEF, 6));
+			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.GRILLED_PORK, 5));
+			for (int i = 0; i < 160; i++)			_baseChestLoot.add(new ItemStack(Material.BREAD, 5));
+			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.PUMPKIN_PIE, 4));
+			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.COOKIE, 7));
+			for (int i = 0; i < 90; i++)			_baseChestLoot.add(new ItemStack(Material.ROTTEN_FLESH, 4));
+
+			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.WHEAT, 6));
+
+			//Misc
+			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.COMPASS, 1));
+			for (int i = 0; i < 25; i++)			_baseChestLoot.add(new ItemStack(Material.EXP_BOTTLE, 1));
+			for (int i = 0; i < 50; i++)			_baseChestLoot.add(new ItemStack(Material.GOLD_INGOT, 2));
+			for (int i = 0; i < 30; i++)			_baseChestLoot.add(new ItemStack(Material.IRON_INGOT));
+			for (int i = 0; i < 5; i++)				_baseChestLoot.add(new ItemStack(Material.DIAMOND));
+			for (int i = 0; i < 60; i++)			_baseChestLoot.add(new ItemStack(Material.STICK, 4));
+			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.FLINT, 6));
+			for (int i = 0; i < 80; i++)			_baseChestLoot.add(new ItemStack(Material.FEATHER, 6));
+			for (int i = 0; i < 40; i++)			_baseChestLoot.add(new ItemStack(Material.BOAT));
+			for (int i = 0; i < 70; i++)			_baseChestLoot.add(new ItemStack(Material.FISHING_ROD));
+
+			//Building Supplies
+			for (int i = 0; i < 45; i++)			_baseChestLoot.add(new ItemStack(Material.PISTON_BASE, 4));
+
+			/*
+			String material = _baseChestLoot.get(0).getType().toString();
+			double count = 0;
+
+			for (int i = 0; i < _baseChestLoot.size(); i++)
+			{
+				if (!_baseChestLoot.get(i).getType().toString().equalsIgnoreCase(material))
+				{
+					System.out.println(material + " - " + count + " - " + (count / _baseChestLoot.size() * 100) + "%");
+					material = _baseChestLoot.get(i).getType().toString();
+					count = 1;
+				}
+				else
+				{
+					count++;
+				}
+			}
+
+			System.out.println(material + " " + (count / _baseChestLoot.size() * 100) + "%");
+			 */
+		}
+
+		if (_superChestLoot.isEmpty()) 
+		{
+			for (int i = 0; i < 3; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_HELMET));
+			for (int i = 0; i < 1; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_CHESTPLATE));
+			for (int i = 0; i < 2; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_LEGGINGS));
+			for (int i = 0; i < 3; i++)				_superChestLoot.add(new ItemStack(Material.DIAMOND_BOOTS));
+
+			for (int i = 0; i < 30; i++)			_superChestLoot.add(new ItemStack(Material.IRON_HELMET));
+			for (int i = 0; i < 24; i++)			_superChestLoot.add(new ItemStack(Material.IRON_CHESTPLATE));
+			for (int i = 0; i < 27; i++)			_superChestLoot.add(new ItemStack(Material.IRON_LEGGINGS));
+			for (int i = 0; i < 30; i++)			_superChestLoot.add(new ItemStack(Material.IRON_BOOTS));
+
+			for (int i = 0; i < 24; i++)			_superChestLoot.add(new ItemStack(Material.IRON_SWORD));
+			for (int i = 0; i < 8; i++)			_superChestLoot.add(new ItemStack(Material.DIAMOND_SWORD));
+			for (int i = 0; i < 16; i++)			_superChestLoot.add(new ItemStack(Material.DIAMOND_AXE));
+		}
+
+
+		ItemStack stack = _baseChestLoot.get(UtilMath.r(_baseChestLoot.size()));
+		if (superChest)		
+			stack = _superChestLoot.get(UtilMath.r(_superChestLoot.size()));
+
+		int amount = 1;
+
+		if (stack.getType().getMaxStackSize() > 1)
+			amount = Math.max(1, UtilMath.r(stack.getAmount()));
+
+		if (stack.getTypeId() == 33)
+			return ItemStackFactory.Instance.CreateStack(stack.getTypeId(), (byte)0, amount, "Barricade");
+
+		return ItemStackFactory.Instance.CreateStack(stack.getTypeId(), amount);
+	}
+
+	@EventHandler
+	public void StartEffectApply(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+			return;
+
+		for (Player player : GetPlayers(true))
+		{
+			Manager.GetCondition().Factory().Speed("Start Speed", player, player, 30, 1, false, false, false);
+			Manager.GetCondition().Factory().HealthBoost("Start Health", player, player, 30, 1, false, false, false);
+
+			player.setHealth(player.getMaxHealth());
+		}
+	}
+
+	@EventHandler
+	public void SpeedRemove(CustomDamageEvent event)
+	{
+		Player damager = event.GetDamagerPlayer(true);
+		if (damager != null)
+			Manager.GetCondition().EndCondition(damager, null, "Start Speed");
+	}
+
+	//If an item spawns and no one is there to see it, does it really spawn? No.
+	@EventHandler
+	public void ItemSpawn(ItemSpawnEvent event)
+	{
+		for (Player player : GetPlayers(true))
+			if (UtilMath.offset(player, event.getEntity()) < 6)
+				return;
+
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void RedBorderStart(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Prepare)
+			return;
+
+		//Start Red
+		Block block;
+
+		for (int x=WorldData.MinX ; x<=WorldData.MaxX ; x++)
+		{
+			block = WorldData.World.getHighestBlockAt(x, WorldData.MinZ);
+			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
+				block = block.getRelative(BlockFace.DOWN);
+			if (block.getY() > 0)
+				_redLocations.add(block.getLocation());
+
+			block = WorldData.World.getHighestBlockAt(x, WorldData.MaxZ);
+			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
+				block = block.getRelative(BlockFace.DOWN);
+			if (block.getY() > 0)
+				_redLocations.add(block.getLocation());
+		}
+
+		for (int z=WorldData.MinZ ; z<=WorldData.MaxZ ; z++)
+		{
+			block = WorldData.World.getHighestBlockAt(WorldData.MinX, z);
+			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
+				block = block.getRelative(BlockFace.DOWN);
+			if (block.getY() > 0)
+				_redLocations.add(block.getLocation());
+
+			block = WorldData.World.getHighestBlockAt(WorldData.MaxX, z);
+			while (!UtilBlock.solid(block) && !block.isLiquid() && block.getY() > 0)
+				block = block.getRelative(BlockFace.DOWN);
+			if (block.getY() > 0)
+				_redLocations.add(block.getLocation());
+		}
+	}
+
+	public int RedMax()
+	{
+		return _maxSpreadRate;// + (24 - GetPlayers(true).size())*2;
+	}
+
+	@EventHandler
+	public void RedUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if (!IsLive())
+			return;
+
+		long time = System.currentTimeMillis();
+
+		if (_redLocations.isEmpty())
+			return;
+
+		int max = Math.max(5, Math.min(RedMax(), _redLocations.size()/100));
+
+		for (int i=0 ; i<max ; i++)
+		{
+			if (_redLocations.isEmpty())
+				break;
+
+			Location loc = _redLocations.remove(UtilMath.r(_redLocations.size()));
+
+			//Already Red
+			if (IsRed(loc.getBlock()))
+			{
+				i = Math.max(0, i-1);
+				continue;
+			}
+
+			//Set to Red
+			SetRed(loc);
+
+			//Spread to Neighbours
+			Block block = loc.getBlock();
+
+			RedSpread(block.getRelative(BlockFace.UP));
+			RedSpread(block.getRelative(BlockFace.DOWN));
+
+			if (!RedSpread(block.getRelative(BlockFace.NORTH)))
+			{
+				RedSpread(block.getRelative(BlockFace.NORTH).getRelative(BlockFace.UP));
+				RedSpread(block.getRelative(BlockFace.NORTH).getRelative(BlockFace.DOWN));
+			}
+
+			if (!RedSpread(block.getRelative(BlockFace.EAST)))
+			{
+				RedSpread(block.getRelative(BlockFace.EAST).getRelative(BlockFace.UP));
+				RedSpread(block.getRelative(BlockFace.EAST).getRelative(BlockFace.DOWN));
+			}
+
+			if (!RedSpread(block.getRelative(BlockFace.SOUTH)))
+			{
+				RedSpread(block.getRelative(BlockFace.SOUTH).getRelative(BlockFace.UP));
+				RedSpread(block.getRelative(BlockFace.SOUTH).getRelative(BlockFace.DOWN));
+			}
+
+			if (!RedSpread(block.getRelative(BlockFace.WEST)))
+			{
+				RedSpread(block.getRelative(BlockFace.WEST).getRelative(BlockFace.UP));
+				RedSpread(block.getRelative(BlockFace.WEST).getRelative(BlockFace.DOWN));
+			}
+		}
+
+		totalTime += System.currentTimeMillis() - time;
+	}
+
+	@EventHandler
+	public void RedTimer(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.MIN_01)
+			return;
+
+		if (!IsLive())
+			return;
+
+		System.out.println(" ");
+		System.out.println("Game Time: " + UtilTime.MakeStr(System.currentTimeMillis() - this.GetStateTime()));
+		System.out.println("Creep Size: " + _redLocations.size());
+		System.out.println("Creep Time: " + UtilTime.convertString(totalTime, 4, TimeUnit.SECONDS));
+		System.out.println(" ");
+
+		totalTime = 0;
+	}
+
+	public boolean RedSpread(Block block)
+	{
+		if (block == null || block.getType() == Material.AIR)
+			return false;
+
+		//Inside Boundary
+		if (UtilMath.offset(_spawn, block.getLocation()) < 48)
+			return false;
+
+		//Liquid
+		if (block.isLiquid())
+		{
+			if (_ignoreLiquids)
+				return false;
+
+			//Only freeze surface water
+			boolean surroundedByWater = true;
+			for (Block other : UtilBlock.getSurrounding(block, false))
+			{
+				if (other.getY() < block.getY())
+					continue;
+
+				if (!other.isLiquid() && !IsRed(other))
+				{
+					surroundedByWater = false;
+					break;
+				}
+			}
+			if (surroundedByWater)
+				return false;
+
+			//Dont Spread to Moving
+			if (block.getTypeId() == 9)
+				if (block.getData() != 0)
+					return false;
+
+			//Dont spread near moving
+			for (Block other : UtilBlock.getSurrounding(block, false))
+			{
+				if (other.getTypeId() == 9 && other.getData() != 0)
+				{
+					return false;
+				}
+			}
+		}
+
+		//Ignore Signs
+		if (block.getType() == Material.SIGN || block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)
+			return false;
+
+		//Pre-Red
+		if (IsRed(block))
+		{
+			return false;
+		}
+
+		if ((!UtilBlock.solid(block) || UtilBlock.airFoliage(block) || block.getType() == Material.CHEST))
+		{
+			if (!block.isLiquid())
+			{
+				while (block.getType() == Material.VINE)
+				{
+					RedChangeBlock(block.getLocation(), 0, (byte)0);
+					block = block.getRelative(BlockFace.DOWN);
+				}
+
+				//Remove Foliage
+				if (block.getType() != Material.AIR)
+					RedChangeBlock(block.getLocation(), 0, (byte)0);
+
+				return false;
+			}
+		}
+
+		//Outside Boundaries
+		if (block.getX() < WorldData.MinX || block.getX() > WorldData.MaxX || block.getZ() < WorldData.MinZ || block.getZ() > WorldData.MaxZ)	
+			return false;
+
+		//Not Visible
+		if (!UtilBlock.isVisible(block))
+			return false;
+
+		//Apply
+		_redLocations.add(block.getLocation());
+		return true;
+	}
+
+	public void RedChangeBlock(Location loc, int id, byte data)
+	{
+		if (!IsLive())
+			return;
+
+		MapUtil.ChunkBlockChange(loc, id, data, false);
+
+		//Old Style
+		/*
+		if (true)
+		{
+			for (Player player : UtilServer.getPlayers())
+			{
+				if (Math.abs(player.getLocation().getChunk().getX() - loc.getChunk().getX()) > UtilServer.getServer().getViewDistance())
+					continue;
+
+				if (Math.abs(player.getLocation().getChunk().getZ() - loc.getChunk().getZ()) > UtilServer.getServer().getViewDistance())
+					continue;
+
+				player.sendBlockChange(loc, id, data);
+			}
+
+			return;
+		}
+		 */
+
+		//Non-Queue
+		for (Player player : UtilServer.getPlayers())
+		{
+			if (Math.abs(player.getLocation().getChunk().getX() - loc.getChunk().getX()) > UtilServer.getServer().getViewDistance())
+				continue;
+
+			if (Math.abs(player.getLocation().getChunk().getZ() - loc.getChunk().getZ()) > UtilServer.getServer().getViewDistance())
+				continue;
+
+			if (!_redChunks.containsKey(player))
+				_redChunks.put(player, new ArrayList<ChunkChange>());
+
+			boolean added = false;
+			for (ChunkChange change : _redChunks.get(player))
+			{
+				if (change.Chunk.equals(loc.getChunk()))// && change.DirtyCount < 63)
+				{
+					change.AddChange(loc, id, data);
+					added = true;
+					break;
+				}
+			}
+			if (!added)
+				_redChunks.get(player).add(new ChunkChange(loc, id, data));
+		}
+	}
+
+	@EventHandler
+	public void RedChunkUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		if (!IsLive())
+			return;
+
+		for (Player player : _redChunks.keySet())
+		{
+			//Remove Far Away
+			Iterator<ChunkChange> chunkIterator = _redChunks.get(player).iterator();
+			while (chunkIterator.hasNext())
+			{
+				ChunkChange change = chunkIterator.next();
+
+				if (Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX()) > UtilServer.getServer().getViewDistance() ||
+						Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ()) > UtilServer.getServer().getViewDistance())
+				{
+					chunkIterator.remove();
+				}
+			}
+
+			if (_redChunks.get(player).isEmpty())
+				continue;
+
+			//Get Fittest Chunk to Update
+			int bestId = -1;
+			double bestScore = 0;
+
+			for (int i=0 ; i<_redChunks.get(player).size() ; i++)
+			{
+				ChunkChange change = _redChunks.get(player).get(i);
+
+				//Base Score, 1 per block
+				double score = change.Changes.size();
+
+				//Time Score, multiply block score by 1 + 0.5 per second
+				score = score * (1 + (System.currentTimeMillis() - change.Time)/200d);
+
+				//Distance Divisor
+				double dist = 0.5;
+				if (!player.getLocation().getChunk().equals(change.Chunk))
+				{
+					int x = Math.abs(player.getLocation().getChunk().getX() - change.Chunk.getX());
+					int z = Math.abs(player.getLocation().getChunk().getZ() - change.Chunk.getZ());
+					dist = Math.sqrt(x*x + z*z);
+				}
+				score = score/(dist*dist);
+
+				if (bestId == -1 || score > bestScore)
+				{
+					bestId = i;
+					bestScore = score;
+				}
+			}
+
+			if (bestId == -1)
+				continue;
+
+			//Send MultiBlock or Chunk Update for Fittest Chunk
+			ChunkChange change = _redChunks.get(player).remove(bestId);
+
+			if (change.DirtyCount > 63)
+				MapUtil.SendChunkForPlayer(change.Chunk.getX(), change.Chunk.getZ(), player);
+			else
+				MapUtil.SendMultiBlockForPlayer(change.Chunk.getX(), change.Chunk.getZ(), change.DirtyBlocks, change.DirtyCount, change.Chunk.getWorld(), player);
+		}
+	}
+
+	public boolean IsRed(Block block)
+	{
+		if (!_redMap.containsKey(block.getX()))
+			return false;
+
+		if (!_redMap.get(block.getX()).containsKey(block.getY()))
+			return false;
+
+		return _redMap.get(block.getX()).get(block.getY()).contains(block.getZ());
+	}
+
+	public void SetRed(Location loc)
+	{
+		//Save Red
+		if (!_redMap.containsKey(loc.getBlockX()))
+			_redMap.put(loc.getBlockX(), new HashMap<Integer, HashSet<Integer>>());
+
+		if (!_redMap.get(loc.getBlockX()).containsKey(loc.getBlockY()))
+			_redMap.get(loc.getBlockX()).put(loc.getBlockY(), new HashSet<Integer>());
+
+		_redMap.get(loc.getBlockX()).get(loc.getBlockY()).add(loc.getBlockZ());
+
+		//Red
+		if (_spreadType == 0)
+		{
+			RedChangeBlock(loc, 159, (byte)14);
+		}
+		//Snow
+		else if (_spreadType == 1)
+		{
+			if (loc.getBlock().getType() == Material.LEAVES)									//RedChangeBlock(loc, 79, (byte)0);							
+			{
+
+			}
+			else if (loc.getBlock().getTypeId() == 8 || loc.getBlock().getTypeId() == 9)		RedChangeBlock(loc, 79, (byte)0);
+			else if (loc.getBlock().getTypeId() == 10 || loc.getBlock().getTypeId() == 11)		RedChangeBlock(loc, 49, (byte)0);
+			else																				RedChangeBlock(loc, 80, (byte)0);
+		}
+		//Nether
+		else 
+		{
+			if (loc.getBlock().getType() == Material.LEAVES)									RedChangeBlock(loc, 88, (byte)0);
+			else if (loc.getBlock().getTypeId() == 8 || loc.getBlock().getTypeId() == 9)		RedChangeBlock(loc, 49, (byte)0);
+			else
+			{
+				double r = Math.random();
+				if (r > 0.1)			RedChangeBlock(loc, 87, (byte)0);
+				else					RedChangeBlock(loc, 153, (byte)0);
+			}	
+		}
+	}
+
+	@EventHandler
+	public void RedAttack(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FASTER)
+			return;
+
+		for (Player player : GetPlayers(true))
+		{
+			boolean near = false;
+
+			for (Block block : UtilBlock.getInRadius(player.getLocation(), 5d).keySet())
+			{
+				if (!IsRed(block))
+					continue;
+
+				near = true;
+
+				//Red
+				if (_spreadType == 0)
+				{
+					if (block.getRelative(BlockFace.UP).getType() == Material.AIR)
+					{
+						block.getRelative(BlockFace.UP).setType(Material.FIRE);
+						break;
+					}
+				}
+
+				//Snow
+				else if (_spreadType == 1)
+				{
+					if (Math.random() > 0.95)
+						player.playEffect(block.getLocation().add(0, 1, 0), Effect.STEP_SOUND, Material.SNOW_BLOCK);
+
+					if (Math.random() > 0.8)
+					{			
+						Vector traj = UtilAlg.getTrajectory(block.getLocation().add(0.5, 1.5, 0.5), player.getLocation());
+
+						Snowball ball = player.getWorld().spawn(block.getLocation().add(0.5, 1.5, 0.5).subtract(traj.clone().multiply(8 + UtilMath.r(8))), Snowball.class);	
+
+						ball.setVelocity(UtilAlg.getTrajectory(ball.getLocation(), player.getEyeLocation().add(0, 3, 0)).add(new Vector(Math.random()-0.5, Math.random()-0.5, Math.random()-0.5).multiply(0.1)));
+					}	
+				}
+
+				//Nether
+				if (_spreadType == 2)
+				{
+					if (block.getRelative(BlockFace.UP).getType() == Material.AIR)
+					{
+						block.getRelative(BlockFace.UP).setType(Material.FIRE);
+						break;
+					}
+				}
+			}
+
+			if (!near)
+			{
+				if (!UtilEnt.isGrounded(player))
+				{
+					Block block = player.getLocation().getBlock();
+
+					while (!UtilBlock.solid(block) && block.getY() > 0)
+						block = block.getRelative(BlockFace.DOWN);
+
+					if (IsRed(block) || block.getY() == 0)
+						near = true;
+				}
+			}
+
+			if (!near)
+			{
+				if (_deathmatchLive && UtilMath.offset(player.getLocation(), _spawn) > 48)
+					near = true;
+			}
+
+			if (near)
+			{
+				player.getWorld().playSound(player.getLocation(), Sound.AMBIENCE_RAIN, 0.5f, 0f);
+
+				if (!_redOutTime.containsKey(player))
+				{
+					_redOutTime.put(player, System.currentTimeMillis());
+				} 
+				else
+				{
+					if (UtilTime.elapsed(_redOutTime.get(player), 5000))
+					{ 
+						Manager.GetDamage().NewDamageEvent(player, null, null, 
+								DamageCause.VOID, 1, false, true, false,
+								"Hunger Games", _spreadName);	
+					}
+				}
+			}
+			else
+			{
+				_redOutTime.remove(player);
+			}
+		}
+	}
+
+	@EventHandler
+	public void RedDamage(CustomDamageEvent event)
+	{
+		if (event.GetProjectile() == null)
+			return;
+
+		if (!(event.GetProjectile() instanceof Snowball))
+			return;
+
+		event.AddMod("Snowball", _spreadName, 2, true);
+
+		event.AddKnockback("Snowball", 4);
+	}
+
+	@EventHandler
+	public void DayNightCycle(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		long time = WorldData.World.getTime();
+
+		if (time > 22000 || time < 14000)
+		{
+			WorldTimeSet = (WorldTimeSet + 4)%24000;
+		}
+		else
+		{
+			WorldTimeSet = (WorldTimeSet + 16)%24000;
+		}
+
+		WorldData.World.setTime(WorldTimeSet);
+	}
+
+	@EventHandler
+	public void SupplyDrop(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (event.getType() != UpdateType.FASTEST)
+			return;
+
+		long time = WorldData.World.getTime();
+
+		if (time > 14000 && time < 23000)
+		{
+			if (_supplyCurrent == null && !_deathmatchCountdown && !_deathmatchLive)
+			{
+				if (_supplyLocations.isEmpty())
+					return;
+
+				_supplyCurrent = _supplyLocations.remove(UtilMath.r(_supplyLocations.size()));
+
+				//Remove Prior
+				_supplyChests.remove(_supplyCurrent.getBlock().getRelative(BlockFace.UP));
+				_supplyCurrent.getBlock().getRelative(BlockFace.UP).setType(Material.AIR);
+
+				//Create New
+				_supplyCurrent.getBlock().setType(Material.BEACON);
+				for (int x=-1 ; x<=1 ; x++)
+					for (int z=-1 ; z<=1 ; z++)
+						_supplyCurrent.getBlock().getRelative(x, -1, z).setType(Material.IRON_BLOCK);
+
+				//Announce
+				this.Announce(C.cYellow + C.Bold + "Supply Drop Incoming (" + ChatColor.RESET + UtilWorld.locToStrClean(_supplyCurrent) + C.cYellow + C.Bold + ")");
+			}
+		}
+		else
+		{
+			if (_supplyCurrent != null)
+			{
+				if (_supplyEffect == null)
+				{
+					_supplyEffect = _supplyCurrent.clone();
+					_supplyEffect.setY(250);
+				}
+
+				FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(Color.YELLOW).with(Type.BURST).trail(false).build();
+				UtilFirework.playFirework(_supplyEffect, effect);
+
+				_supplyEffect.setY(_supplyEffect.getY()-2);
+
+				if (UtilMath.offset(_supplyEffect, _supplyCurrent) < 2)
+				{
+					effect = FireworkEffect.builder().flicker(false).withColor(Color.YELLOW).with(Type.BALL_LARGE).trail(true).build();
+					UtilFirework.playFirework(_supplyEffect, effect);
+
+					//Create Chest
+					_supplyCurrent.getBlock().setType(Material.GLASS);
+					_supplyCurrent.getBlock().getRelative(BlockFace.UP).setType(Material.CHEST);
+					_supplyChests.add(_supplyCurrent.getBlock().getRelative(BlockFace.UP));
+					_openedChest.remove(_supplyCurrent);
+
+					//Reset
+					_supplyEffect = null;
+					_supplyCurrent = null;
+				}
+			}
+		}
+	}
+
+	@EventHandler
+	public void SupplyGlow(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		if (_supplyChests.isEmpty())
+			return;
+
+		Iterator<Block> chestIterator = _supplyChests.iterator();
+
+		while (chestIterator.hasNext())
+		{
+			Block block = chestIterator.next();
+
+			if (block.getType() != Material.CHEST)
+			{
+				chestIterator.remove();
+				continue;
+			}
+
+			UtilParticle.PlayParticle(ParticleType.SPELL, block.getLocation().add(0.5, 0.5, 0.5), 0.3f, 0.3f, 0.3f, 0, 1,
+					ViewDist.LONG, UtilServer.getPlayers());
+		}
+	}
+
+	@EventHandler
+	public void DeathmatchUpdate(UpdateEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (_deathmatchLive)
+		{
+			if (event.getType() != UpdateType.SEC)
+				return;
+
+			if (_deathmatchTime <= 0)
+				return;
+
+			for (Player player : GetPlayers(true))
+				VisibilityManager.Instance.refreshPlayerToAll(player);
+
+			Announce(C.cRed + C.Bold + "Deathmatch in " + _deathmatchTime + "...");
+			_deathmatchTime--;
+		}
+
+		else if (_deathmatchCountdown)
+		{
+			if (event.getType() != UpdateType.TICK)
+				return;
+
+			long timeLeft = 60000 - (System.currentTimeMillis() - _deathmatchTime);
+
+			if (timeLeft <= 0)
+			{ 
+				_deathmatchLive = true;
+
+				for (GameTeam team : GetTeamList())
+					team.SpawnTeleport();
+
+				_redLocations.clear();
+
+				for (Block block : UtilBlock.getInRadius(_spawn, 52d).keySet())
+					RedSpread(block);
+
+				_deathmatchTime = 10;
+			}	 
+		}
+		else
+		{
+			if (event.getType() != UpdateType.SEC)
+				return;
+
+			if (!UtilTime.elapsed(GetStateTime(), 360000))
+				return;
+
+			if (GetPlayers(true).size() > 4)
+				return;
+
+			if (!UtilTime.elapsed(_deathmatchTime, 60000))
+				return;
+
+			Announce(C.cGreen + C.Bold + "Type " + ChatColor.RESET + C.Bold + "/dm" + C.cGreen + C.Bold + " to start Deathmatch!");
+
+			_deathmatchTime = System.currentTimeMillis();
+		}
+	}
+
+	@EventHandler
+	public void DeathmatchMoveCancel(PlayerMoveEvent event)
+	{
+		if (!_deathmatchLive)
+			return;
+
+		if (_deathmatchTime <= 0)
+			return;
+
+		if (UtilMath.offset2d(event.getFrom(), event.getTo()) == 0)
+			return;
+
+		if (!IsAlive(event.getPlayer()))
+			return;
+
+		event.setTo(event.getFrom());
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void DeathmatchDamage(CustomDamageEvent event)
+	{
+		if (!_deathmatchLive)
+			return;
+
+		if (_deathmatchTime <= 0)
+			return;
+
+		event.SetCancelled("Deathmatch");
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void DeathmatchStart(PlayerCommandPreprocessEvent event)
+	{
+		if (!event.getMessage().equalsIgnoreCase("/dm"))
+			return;
+		
+		event.setCancelled(true);
+		
+		if (!IsAlive(event.getPlayer()))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "You are not in the game."));
+			return;
+		}
+
+		if (!IsLive())
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
+			return;
+		}
+
+		if (!UtilTime.elapsed(GetStateTime(), 360000))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
+			return;
+		}
+
+		if (GetPlayers(true).size() > 4)
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
+			return;
+		}
+
+		if (_deathmatchCountdown)
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Deathmatch cannot be started now."));
+			return;
+		}
+
+		_deathmatchCountdown = true;
+
+		Announce(C.cGreen + C.Bold + event.getPlayer().getName() + " has initiated Deathmatch!");
+		Announce(C.cGreen + C.Bold + "Deathmatch starting in 60 seconds...");
+		_deathmatchTime = System.currentTimeMillis();
+
+		for (Player player : UtilServer.getPlayers())
+			player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 1f, 1f);
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void CropTrample(PlayerInteractEvent event)
+	{
+		if (event.getAction() != Action.PHYSICAL)
+			return;
+
+		if (event.getPlayer().getLocation().getBlock().getRelative(BlockFace.DOWN).getType() != Material.SOIL)
+			return;
+
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void CompassUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		if (!IsLive())
+			return;
+
+		//Night Time > Drop Target
+		if (WorldData.World.getTime() > 14000 && WorldData.World.getTime() < 23000 && _supplyCurrent != null)
+		{
+			for (Player player : GetPlayers(true))
+			{
+				player.setCompassTarget(_supplyCurrent);
+
+				for (int i : player.getInventory().all(Material.COMPASS).keySet()) 
+				{
+					ItemStack stack = player.getInventory().getItem(i);
+
+					ItemMeta itemMeta = stack.getItemMeta();
+					itemMeta.setDisplayName(
+							C.cWhite + C.Bold + "Supply Drop Location: " +  C.cYellow + UtilMath.trim(1, UtilMath.offset(player.getLocation(), _supplyCurrent)));
+					stack.setItemMeta(itemMeta);
+
+					player.getInventory().setItem(i, stack);
+				}
+			}
+		}
+		//Player Target
+		else
+		{
+			for (Player player : GetPlayers(true))
+			{	
+				Player target = null;
+				double bestDist = 0;
+
+				for (Player other : Manager.GetGame().GetPlayers(true))
+				{
+					if (other.equals(player))
+						continue;
+
+					if (other.isSneaking())
+						continue;
+					
+					if (GetTeam(player).equals(GetTeam(other)))
+						continue;
+
+					double dist = UtilMath.offset(player, other);
+
+					if (target == null || dist < bestDist)
+					{
+						target = other;
+						bestDist = dist;
+					}
+				}
+
+				if (target != null)
+				{
+					player.setCompassTarget(target.getLocation());
+
+					for (int i : player.getInventory().all(Material.COMPASS).keySet()) 
+					{
+						ItemStack stack = player.getInventory().getItem(i);
+
+						ItemMeta itemMeta = stack.getItemMeta();
+						itemMeta.setDisplayName(
+								"    " + C.cWhite + C.Bold + "Nearest Player: " + GetTeam(target).GetColor() + target.getName() + 
+								"    " + C.cWhite + C.Bold + "Distance: " + GetTeam(target).GetColor() + UtilMath.trim(1, bestDist));
+						stack.setItemMeta(itemMeta);
+
+						player.getInventory().setItem(i, stack);
+					}
+				}
+			}
+		}	
+	}		
+
+	@EventHandler
+	public void DisallowBrewFurnace(PlayerInteractEvent event)
+	{
+		if (event.getClickedBlock() == null)
+			return;
+
+		if (event.getClickedBlock().getType() == Material.BREWING_STAND ||
+			event.getClickedBlock().getType() == Material.FURNACE || 
+			event.getClickedBlock().getType() == Material.BURNING_FURNACE)
+			event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void CancelItemFrameBreak(HangingBreakEvent event)
+	{
+		if (event.getEntity() instanceof ItemFrame)
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler
+	public void TNTDelay(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+			return;
+
+		for (Player player : UtilServer.getPlayers())
+			Recharge.Instance.useForce(player, "Throw TNT", 30000);
+	}
+
+	@EventHandler
+	public void TNTThrow(PlayerInteractEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (!UtilEvent.isAction(event, ActionType.L))
+			return;
+
+		Player player = event.getPlayer();
+
+		if (!UtilInv.IsItem(player.getItemInHand(), Material.TNT, (byte)0))
+			return;
+
+		event.setCancelled(true);
+
+		if (!Recharge.Instance.use(player, "Throw TNT", 0, true, false))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main(GetName(), "You cannot use " + F.item("Throw TNT") + " yet."));
+			return;
+		}
+
+		if (!Manager.GetGame().CanThrowTNT(player.getLocation()))
+		{
+			//Inform
+			UtilPlayer.message(event.getPlayer(), F.main(GetName(), "You cannot use " + F.item("Throw TNT") + " here."));
+			return;
+		}
+
+		UtilInv.remove(player, Material.TNT, (byte)0, 1);
+		UtilInv.Update(player);
+
+		TNTPrimed tnt = player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
+
+		UtilAction.velocity(tnt, player.getLocation().getDirection(), 0.5, false, 0, 0.1, 10, false);
+
+		_tntMap.put(tnt, player);
+	}
+
+	@EventHandler
+	public void TNTExplosion(ExplosionPrimeEvent event)
+	{
+		if (!_tntMap.containsKey(event.getEntity()))
+			return;
+
+		Player player = _tntMap.remove(event.getEntity());
+
+		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
+			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, player, 50, 0.1, false, false);
+	}
+
+	@EventHandler
+	public void BlockPlace(BlockPlaceEvent event)
+	{	
+		if (IsRed(event.getBlockAgainst()))
+		{
+			event.setCancelled(true);
+			return;
+		}
+
+		if (event.getItemInHand().getType() == Material.PISTON_BASE)
+		{
+			_placedBlocks.add(event.getBlock().getLocation());
+			event.setCancelled(false);
+
+			final Block block = event.getBlock();
+
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
+			{
+				public void run()
+				{
+					block.setType(Material.PISTON_BASE);
+					block.setData((byte) 6);
+				}
+			}, 0);
+		}
+	}
+
+	//@EventHandler
+    public void TourneyKills(CombatDeathEvent event)
+    {
+	    if (!(event.GetEvent().getEntity() instanceof Player))
+            return;
+	   
+	    Player killed = (Player)event.GetEvent().getEntity();
+	
+	    if (event.GetLog().GetKiller() != null)
+	    {
+            Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
+
+            if (killer != null && !killer.equals(killed))
+            {
+            	//Manager.GetStatsManager().addStat(killer, GetName(), "kills", 1);
+	        }
+	    }
+	    
+	    if (event.GetLog().GetPlayer() != null)
+	    {
+            if (killed != null)
+            {
+            	//Manager.GetStatsManager().addStat(killed, GetName(), "deaths", 1);
+	        }
+	    }
+    }
+	
+	@EventHandler
+	public void BlockBreak(BlockBreakEvent event)
+	{
+		if (_placedBlocks.remove(event.getBlock().getLocation()))
+		{
+			event.getBlock().getWorld().playEffect(event.getBlock().getLocation(), Effect.STEP_SOUND, event.getBlock().getType());
+			event.getBlock().setType(Material.AIR);
+		}
+	}
+
+	@EventHandler
+	public void BlockBurn(BlockBurnEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void BlockSpread(BlockSpreadEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void BlockFade(BlockFadeEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void BlockDecay(LeavesDecayEvent event)
+	{
+		event.setCancelled(true);
+	}
+
+	@EventHandler
+	public void PlayerKillAward(CombatDeathEvent event)
+	{
+		Game game = Manager.GetGame();
+		if (game == null)	return;
+
+		if (!(event.GetEvent().getEntity() instanceof Player))
+			return;
+
+		FireworkEffect effect = FireworkEffect.builder().flicker(false).withColor(Color.RED).with(Type.BALL_LARGE).trail(false).build();
+		for (int i=0 ; i<3 ; i++)
+			UtilFirework.launchFirework(event.GetEvent().getEntity().getLocation(), effect, null, 3);
+
+		if (event.GetLog().GetKiller() == null)
+			return;
+
+		Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
+		if (killer == null)
+			return;
+
+		if (killer.equals(event.GetEvent().getEntity()))
+			return;
+
+		killer.giveExpLevels(1);
+	}
+
+	@EventHandler
+	public void DisableDamageLevel(CustomDamageEvent event)
+	{
+		event.SetDamageToLevel(false);
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void ExplosionDamageRemove(EntityExplodeEvent event)
+	{
+		event.blockList().clear();
+	}
+
+	@EventHandler
+	public void FixClean(PlayerQuitEvent event)
+	{
+		_redChunks.remove(event.getPlayer());
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
index 812aa7757..89378b55d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
@@ -38,6 +38,7 @@ public class GameCreationManager implements Listener
 
 	public String MapSource = null;
 	public String MapPref = null;
+	public String MapSource = null;
 	
 	public GameCreationManager(ArcadeManager manager)
 	{

From b7ad0035bc9ff2535069948990ff9a3a379bce9d Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 17 Jul 2015 07:06:49 +0200
Subject: [PATCH 027/113] Implementing UHC team system to ssm, sg and skywars.

---
 .../src/nautilus/game/arcade/game/Game.java   |   2 +
 .../arcade/game/games/skywars/Skywars.java    |   2 +
 .../game/games/skywars/TeamSkywars.java       | 199 +++++++++++++++++-
 .../arcade/game/games/smash/SuperSmash.java   |   4 +-
 .../game/games/smash/TeamSuperSmash.java      | 186 ++++++++++++++++
 .../games/survivalgames/SurvivalGames.java    |   2 +
 .../survivalgames/TeamSurvivalGames.java      | 187 ++++++++++++++++
 .../arcade/managers/GameCreationManager.java  |   1 -
 .../arcade/managers/GameLobbyManager.java     |  53 +----
 9 files changed, 571 insertions(+), 65 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 24c3fe27d..0c4f1f519 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -261,6 +261,8 @@ public abstract class Game implements Listener
 	public boolean CanAddStats = true;
 	public boolean CanGiveLoot = true;
 	
+	public boolean HideTeamSheep = false;
+	
 	public boolean VersionRequire1_8 = false;
 	
 	public ArrayList<String> GemBoosters = new ArrayList<String>();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index 593b185ed..705ee46a1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -143,6 +143,8 @@ public abstract class Skywars extends Game
 				}, description);
 
 		PrepareFreeze = true;
+		
+		HideTeamSheep = true;
 
 		CompassEnabled = true;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 63414d069..9efb5366c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -1,18 +1,24 @@
 package nautilus.game.arcade.game.games.skywars;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -20,9 +26,16 @@ import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class TeamSkywars extends Skywars
 {
+	
+	private NautHashMap<Player, Player> _teamReqs = new NautHashMap<Player, Player>();
+	
 	public TeamSkywars(ArcadeManager manager)
 	{
 		super(manager, GameType.SkywarsTeams, 
@@ -32,6 +45,7 @@ public class TeamSkywars extends Skywars
 					"Craft or loot gear for combat",
 					"Last team alive wins!"
 							});
+		
 	}
 	
 	@EventHandler
@@ -99,17 +113,6 @@ public class TeamSkywars extends Skywars
 			}
 		}
 	}
-
-	private BlockFace getBlockface(BlockFace face) 
-	{
-		for(BlockFace faces : BlockFace.values()) {
-			if(faces.ordinal() == face.ordinal() + 1)
-			{	
-				return face;
-			}
-		}
-		return BlockFace.NORTH;
-	}
 	
 	private enum TeamColors
 	{
@@ -269,4 +272,178 @@ public class TeamSkywars extends Skywars
 		return players;
 	}
 
+	@Override
+	public boolean CanJoinTeam(GameTeam team)
+	{
+		return team.GetSize() < 2;
+	}
+
+	@EventHandler
+	public void TeamRename(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+			return;
+
+		for (GameTeam team : GetTeamList())
+		{
+			// Big Team
+			if (team.GetSize() > 2)
+			{
+				team.SetName("Team " + team.GetName());
+				continue;
+			}
+
+			String name = "";
+
+			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			{
+				Player player = team.GetPlayers(false).get(i);
+
+				name += player.getName();
+
+				if (i < team.GetPlayers(false).size() - 1)
+					name += " & ";
+			}
+
+			team.SetName(name);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void teamSelectInteract(PlayerInteractEntityEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		if (event.getRightClicked() == null)
+			return;
+		
+		if (!(event.getRightClicked() instanceof Player))
+			return;
+
+		Player player = event.getPlayer();
+
+		//Observer
+		if (Manager.IsObserver(player))
+		{
+			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+
+		selectTeamMate(player, (Player)event.getRightClicked());
+	}
+	
+	@EventHandler
+	public void teamSelectCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+				
+		if (!event.getMessage().toLowerCase().startsWith("/team "))
+			return;
+		
+		event.setCancelled(true);
+		
+		Player target = UtilPlayer.searchOnline(event.getPlayer(), event.getMessage().split(" ")[1], true);
+		if (target == null)
+			return;
+		
+		//Observer
+		if (Manager.IsObserver(event.getPlayer()))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+		
+		if (event.getPlayer().equals(target))
+			return;
+		
+		selectTeamMate(event.getPlayer(), target);
+	}
+
+	public void selectTeamMate(Player player, Player ally)
+	{
+		//Accept Invite
+		if (_teamReqs.containsKey(ally) && _teamReqs.get(ally).equals(player))
+		{
+			//Remove Prefs
+			_teamReqs.remove(player);
+			_teamReqs.remove(ally);
+			
+			//Inform
+			UtilPlayer.message(player, F.main("Game", "You accepted " + ally.getName() + "'s Team Request!"));
+			UtilPlayer.message(ally, F.main("Game", player.getName() + " accepted your Team Request!"));
+			
+			//Leave Old Teams
+			if (GetTeam(player) != null)
+				GetTeam(player).DisbandTeam();
+			
+			if (GetTeam(ally) != null)
+				GetTeam(ally).DisbandTeam();
+				
+			//Get Team
+			GameTeam team = getEmptyTeam();
+			if (team == null)
+				return;
+				
+			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			
+			//Join Team
+			SetPlayerTeam(player, team, true);
+			SetPlayerTeam(ally, team, true);			
+		}
+		//Send Invite
+		else
+		{
+			//Already on Team with Target
+			if (GetTeam(player) != null)
+				if (GetTeam(player).HasPlayer(ally))
+					return;
+				
+			//Inform Player
+			UtilPlayer.message(player, F.main("Game", "You sent a Team Request to " + ally.getName() + "!"));
+			
+			//Inform Target
+			if (Recharge.Instance.use(player, "Team Req " + ally.getName(), 2000, false, false))
+			{
+				UtilPlayer.message(ally, F.main("Game", player.getName() + " sent you a Team Request!"));
+				UtilPlayer.message(ally, F.main("Game", "Type " + F.elem("/team " + player.getName()) + " to accept!"));
+			}
+			
+			//Add Pref
+			_teamReqs.put(player, ally);
+		}
+	}
+	
+	@EventHandler
+	public void teamQuit(PlayerQuitEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		Player player = event.getPlayer();
+		
+		if (GetTeam(player) != null)
+			GetTeam(player).DisbandTeam();
+		
+		Iterator<Player> teamIter = _teamReqs.keySet().iterator();
+		while (teamIter.hasNext())
+		{
+			Player sender = teamIter.next();
+			if (sender.equals(player) || _teamReqs.get(sender).equals(player))
+				teamIter.remove();
+		}
+	}
+	
+	public GameTeam getEmptyTeam()
+	{
+		for (GameTeam team : GetTeamList())
+		{
+			if (team.GetPlayers(false).isEmpty())
+				return team;
+		}
+		
+		return null;
+	}
+
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index d5f6d7869..3920e721e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -120,10 +120,12 @@ public abstract class SuperSmash extends Game
 
 		this.DeathSpectateSecs = 4;
 
-		SpawnNearAllies = true;
+		this.SpawnNearAllies = true;
 
 		this.WorldWaterDamage = 1000;
 		
+		this.HideTeamSheep = true;
+		
 		// Add stat table here
 		// Example
 		// Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses");
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 1b096c267..039f8349d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -1,19 +1,29 @@
 package nautilus.game.arcade.game.games.smash;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class TeamSuperSmash extends SuperSmash
 {
@@ -22,6 +32,8 @@ public class TeamSuperSmash extends SuperSmash
 	public int PlayersPerTeam = 2;
 	public int TeamCount = 0;
 	
+	private NautHashMap<Player, Player> _teamReqs = new NautHashMap<Player, Player>();
+	
 	public TeamSuperSmash(ArcadeManager manager) 
 	{
 		super(manager, GameType.SmashTeams, 
@@ -214,4 +226,178 @@ public class TeamSuperSmash extends SuperSmash
 
 		return players;
 	}
+
+	@Override
+	public boolean CanJoinTeam(GameTeam team)
+	{
+		return team.GetSize() < PlayersPerTeam;
+	}
+
+	@EventHandler
+	public void TeamRename(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+			return;
+
+		for (GameTeam team : GetTeamList())
+		{
+			// Big Team
+			if (team.GetSize() > PlayersPerTeam)
+			{
+				team.SetName("Team " + team.GetName());
+				continue;
+			}
+
+			String name = "";
+
+			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			{
+				Player player = team.GetPlayers(false).get(i);
+
+				name += player.getName();
+
+				if (i < team.GetPlayers(false).size() - 1)
+					name += " & ";
+			}
+
+			team.SetName(name);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void teamSelectInteract(PlayerInteractEntityEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		if (event.getRightClicked() == null)
+			return;
+		
+		if (!(event.getRightClicked() instanceof Player))
+			return;
+
+		Player player = event.getPlayer();
+
+		//Observer
+		if (Manager.IsObserver(player))
+		{
+			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+
+		selectTeamMate(player, (Player)event.getRightClicked());
+	}
+	
+	@EventHandler
+	public void teamSelectCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+				
+		if (!event.getMessage().toLowerCase().startsWith("/team "))
+			return;
+		
+		event.setCancelled(true);
+		
+		Player target = UtilPlayer.searchOnline(event.getPlayer(), event.getMessage().split(" ")[1], true);
+		if (target == null)
+			return;
+		
+		//Observer
+		if (Manager.IsObserver(event.getPlayer()))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+		
+		if (event.getPlayer().equals(target))
+			return;
+		
+		selectTeamMate(event.getPlayer(), target);
+	}
+
+	public void selectTeamMate(Player player, Player ally)
+	{
+		//Accept Invite
+		if (_teamReqs.containsKey(ally) && _teamReqs.get(ally).equals(player))
+		{
+			//Remove Prefs
+			_teamReqs.remove(player);
+			_teamReqs.remove(ally);
+			
+			//Inform
+			UtilPlayer.message(player, F.main("Game", "You accepted " + ally.getName() + "'s Team Request!"));
+			UtilPlayer.message(ally, F.main("Game", player.getName() + " accepted your Team Request!"));
+			
+			//Leave Old Teams
+			if (GetTeam(player) != null)
+				GetTeam(player).DisbandTeam();
+			
+			if (GetTeam(ally) != null)
+				GetTeam(ally).DisbandTeam();
+				
+			//Get Team
+			GameTeam team = getEmptyTeam();
+			if (team == null)
+				return;
+				
+			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			
+			//Join Team
+			SetPlayerTeam(player, team, true);
+			SetPlayerTeam(ally, team, true);			
+		}
+		//Send Invite
+		else
+		{
+			//Already on Team with Target
+			if (GetTeam(player) != null)
+				if (GetTeam(player).HasPlayer(ally))
+					return;
+				
+			//Inform Player
+			UtilPlayer.message(player, F.main("Game", "You sent a Team Request to " + ally.getName() + "!"));
+			
+			//Inform Target
+			if (Recharge.Instance.use(player, "Team Req " + ally.getName(), 2000, false, false))
+			{
+				UtilPlayer.message(ally, F.main("Game", player.getName() + " sent you a Team Request!"));
+				UtilPlayer.message(ally, F.main("Game", "Type " + F.elem("/team " + player.getName()) + " to accept!"));
+			}
+			
+			//Add Pref
+			_teamReqs.put(player, ally);
+		}
+	}
+	
+	@EventHandler
+	public void teamQuit(PlayerQuitEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		Player player = event.getPlayer();
+		
+		if (GetTeam(player) != null)
+			GetTeam(player).DisbandTeam();
+		
+		Iterator<Player> teamIter = _teamReqs.keySet().iterator();
+		while (teamIter.hasNext())
+		{
+			Player sender = teamIter.next();
+			if (sender.equals(player) || _teamReqs.get(sender).equals(player))
+				teamIter.remove();
+		}
+	}
+	
+	public GameTeam getEmptyTeam()
+	{
+		for (GameTeam team : GetTeamList())
+		{
+			if (team.GetPlayers(false).isEmpty())
+				return team;
+		}
+		
+		return null;
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index d1e8304c6..7d0ee4f2f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -209,6 +209,8 @@ public abstract class SurvivalGames extends Game
 		// Manager.GetAntiStack().SetEnabled(false);
 
 		StrictAntiHack = true;
+		
+		HideTeamSheep = true;
 
 		GameTimeout = 1500000;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 0f0d3ca73..53843827f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -1,22 +1,32 @@
 package nautilus.game.arcade.game.games.survivalgames;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 public class TeamSurvivalGames extends SurvivalGames
 {
@@ -24,6 +34,8 @@ public class TeamSurvivalGames extends SurvivalGames
 	public boolean ForceTeamSize = true;
 	public int PlayersPerTeam = 2;
 	public int TeamCount = 0;
+	
+	private NautHashMap<Player, Player> _teamReqs = new NautHashMap<Player, Player>();
 
 	public TeamSurvivalGames(ArcadeManager manager) 
 	{
@@ -231,4 +243,179 @@ public class TeamSurvivalGames extends SurvivalGames
 
 		return players;
 	}
+
+	@Override
+	public boolean CanJoinTeam(GameTeam team)
+	{
+		return team.GetSize() < PlayersPerTeam;
+	}
+
+	@EventHandler
+	public void TeamRename(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Live)
+			return;
+
+		for (GameTeam team : GetTeamList())
+		{
+			// Big Team
+			if (team.GetSize() > PlayersPerTeam)
+			{
+				team.SetName("Team " + team.GetName());
+				continue;
+			}
+
+			String name = "";
+
+			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			{
+				Player player = team.GetPlayers(false).get(i);
+
+				name += player.getName();
+
+				if (i < team.GetPlayers(false).size() - 1)
+					name += " & ";
+			}
+
+			team.SetName(name);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void teamSelectInteract(PlayerInteractEntityEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		if (event.getRightClicked() == null)
+			return;
+		
+		if (!(event.getRightClicked() instanceof Player))
+			return;
+
+		Player player = event.getPlayer();
+
+		//Observer
+		if (Manager.IsObserver(player))
+		{
+			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+
+		selectTeamMate(player, (Player)event.getRightClicked());
+	}
+	
+	@EventHandler
+	public void teamSelectCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+				
+		if (!event.getMessage().toLowerCase().startsWith("/team "))
+			return;
+		
+		event.setCancelled(true);
+		
+		Player target = UtilPlayer.searchOnline(event.getPlayer(), event.getMessage().split(" ")[1], true);
+		if (target == null)
+			return;
+		
+		//Observer
+		if (Manager.IsObserver(event.getPlayer()))
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+		
+		if (event.getPlayer().equals(target))
+			return;
+		
+		selectTeamMate(event.getPlayer(), target);
+	}
+
+	public void selectTeamMate(Player player, Player ally)
+	{
+		//Accept Invite
+		if (_teamReqs.containsKey(ally) && _teamReqs.get(ally).equals(player))
+		{
+			//Remove Prefs
+			_teamReqs.remove(player);
+			_teamReqs.remove(ally);
+			
+			//Inform
+			UtilPlayer.message(player, F.main("Game", "You accepted " + ally.getName() + "'s Team Request!"));
+			UtilPlayer.message(ally, F.main("Game", player.getName() + " accepted your Team Request!"));
+			
+			//Leave Old Teams
+			if (GetTeam(player) != null)
+				GetTeam(player).DisbandTeam();
+			
+			if (GetTeam(ally) != null)
+				GetTeam(ally).DisbandTeam();
+				
+			//Get Team
+			GameTeam team = getEmptyTeam();
+			if (team == null)
+				return;
+				
+			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			
+			//Join Team
+			SetPlayerTeam(player, team, true);
+			SetPlayerTeam(ally, team, true);			
+		}
+		//Send Invite
+		else
+		{
+			//Already on Team with Target
+			if (GetTeam(player) != null)
+				if (GetTeam(player).HasPlayer(ally))
+					return;
+				
+			//Inform Player
+			UtilPlayer.message(player, F.main("Game", "You sent a Team Request to " + ally.getName() + "!"));
+			
+			//Inform Target
+			if (Recharge.Instance.use(player, "Team Req " + ally.getName(), 2000, false, false))
+			{
+				UtilPlayer.message(ally, F.main("Game", player.getName() + " sent you a Team Request!"));
+				UtilPlayer.message(ally, F.main("Game", "Type " + F.elem("/team " + player.getName()) + " to accept!"));
+			}
+			
+			//Add Pref
+			_teamReqs.put(player, ally);
+		}
+	}
+	
+	@EventHandler
+	public void teamQuit(PlayerQuitEvent event)
+	{
+		if (GetState() != GameState.Recruit)
+			return;
+		
+		Player player = event.getPlayer();
+		
+		if (GetTeam(player) != null)
+			GetTeam(player).DisbandTeam();
+		
+		Iterator<Player> teamIter = _teamReqs.keySet().iterator();
+		while (teamIter.hasNext())
+		{
+			Player sender = teamIter.next();
+			if (sender.equals(player) || _teamReqs.get(sender).equals(player))
+				teamIter.remove();
+		}
+	}
+	
+	public GameTeam getEmptyTeam()
+	{
+		for (GameTeam team : GetTeamList())
+		{
+			if (team.GetPlayers(false).isEmpty())
+				return team;
+		}
+		
+		return null;
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
index 89378b55d..955a6e8f8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
@@ -36,7 +36,6 @@ public class GameCreationManager implements Listener
 	private String _lastMap = "";
 	private ArrayList<GameType> _lastGames = new ArrayList<GameType>();
 
-	public String MapSource = null;
 	public String MapPref = null;
 	public String MapSource = null;
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index 89bf6ada6..c429869b4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -323,7 +323,7 @@ public class GameLobbyManager implements Listener, IPacketHandler
 		_teamBlocks.clear();
 		
 		//Smash
-		if (game.GetType() == GameType.Smash || game.GetType() == GameType.SurvivalGames)
+		if (game.HideTeamSheep)
 		{
 			//Text
 			WriteTeamLine("Select", 0, 159, (byte)15);
@@ -332,57 +332,6 @@ public class GameLobbyManager implements Listener, IPacketHandler
 			CreateScoreboards();
 			return;
 		}
-		
-		//UHC 
-		if (game.GetType() == GameType.UHC)
-		{
-//			if (game.GetTeamList().size() > 1)
-//			{
-//				//Text
-//				WriteTeamLine("", 0, 159, (byte)15);
-//				WriteTeamLine("", 1, 159, (byte)4);
-//				
-//				for (int i=0 ; i<game.GetTeamList().size() ; i++)
-//				{
-//					GameTeam team = game.GetTeamList().get(i);
-//					
-//					//Circle Math
-//					double lead =  i * ((2d * Math.PI)/game.GetTeamList().size());
-//					double sizeMod = 32;
-//					double oX = -Math.sin(lead) * sizeMod;
-//					double oZ = Math.cos(lead) * sizeMod;
-//
-//					//Location
-//					Location entLoc = spawn.clone().add(oX, 0, oZ);
-//					entLoc.setY(_teamDisplay.getY());
-//					
-//					//Blocks
-//					SetKitTeamBlocks(entLoc.clone(), 35, team.GetColorData(), _teamBlocks);
-//
-//					entLoc.add(0, 1.5, 0);
-//
-//					entLoc.getChunk().load();
-//					 
-//					//NPC
-//					Sheep ent = (Sheep)Manager.GetCreature().SpawnEntity(entLoc, EntityType.SHEEP);
-//					ent.setRemoveWhenFarAway(false);
-//					ent.setCustomNameVisible(false);
-//
-//					ent.setColor(DyeColor.getByWoolData(team.GetColorData()));
-//
-//					UtilEnt.Vegetate(ent);
-//
-//					team.SetTeamEntity(ent);
-//
-//					_teams.put(ent, new LobbyEnt(ent, entLoc, team));
-//				}
-//				
-//				return;
-//				
-//			}
-			
-			return;
-		}
 				
 		//Standard
 		if (game.GetKits().length > 1 || game.GetTeamList().size() < 6)

From 6ed3f93df74f61e64402d110126af814e60dc8d7 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 16:17:01 +1000
Subject: [PATCH 028/113] fixed some scoreboard stuff

---
 .../mineplex/core/common/util/UtilAction.java |  7 ++-
 .../game/core/damage/DamageManager.java       | 34 +++++++++---
 .../src/nautilus/game/arcade/game/Game.java   |  6 +--
 .../game/games/skywars/TeamSkywars.java       | 29 ++++++++--
 .../game/games/smash/TeamSuperSmash.java      | 54 +++++++++++--------
 .../survivalgames/TeamSurvivalGames.java      | 30 ++++++++---
 .../arcade/managers/GameLobbyManager.java     |  2 +-
 7 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index ab1814725..09160ddc7 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -1,6 +1,7 @@
 package mineplex.core.common.util;
 
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -39,12 +40,14 @@ public class UtilAction
 		
 		//Velocity
 		ent.setFallDistance(0);
-		ent.setVelocity(vec);	
+		
 		
 		//Debug
 		if (ent instanceof Player && UtilGear.isMat(((Player)ent).getItemInHand(), Material.SUGAR))
 		{
-			UtilPlayer.message(ent, F.main("Debug", "Velocity Sent: " + vec.length()));
+			Bukkit.broadcastMessage(F.main("Debug", "Velocity Sent: " + vec.length()));
 		}	
+		
+		ent.setVelocity(vec);	
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
index 8e052c32d..1d699e938 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
@@ -41,6 +41,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.player.PlayerVelocityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
@@ -251,34 +252,34 @@ public class DamageManager extends MiniPlugin
 			{
 				if (stack == null)
 					continue;
-				
+
 				Map<Enchantment, Integer> enchants = stack.getEnchantments();
 				for (Enchantment e : enchants.keySet())
 				{
 					if (e.equals(Enchantment.PROTECTION_ENVIRONMENTAL))
 						event.AddMod("Ench Prot", damagee.getName(), 0.5 * (double)enchants.get(e), false);
-					
+
 					else if (e.equals(Enchantment.PROTECTION_FIRE) && 
 							event.GetCause() == DamageCause.FIRE &&
 							event.GetCause() == DamageCause.FIRE_TICK &&
 							event.GetCause() == DamageCause.LAVA)
 						event.AddMod("Ench Prot", damagee.getName(), 0.5 * (double)enchants.get(e), false);
-					
+
 					else if (e.equals(Enchantment.PROTECTION_FALL) && 
 							event.GetCause() == DamageCause.FALL)
 						event.AddMod("Ench Prot", damagee.getName(), 0.5 * (double)enchants.get(e), false);
-					
+
 					else if (e.equals(Enchantment.PROTECTION_EXPLOSIONS) && 
 							event.GetCause() == DamageCause.ENTITY_EXPLOSION)
 						event.AddMod("Ench Prot", damagee.getName(), 0.5 * (double)enchants.get(e), false);
-					
+
 					else if (e.equals(Enchantment.PROTECTION_PROJECTILE) && 
 							event.GetCause() == DamageCause.PROJECTILE)
 						event.AddMod("Ench Prot", damagee.getName(), 0.5 * (double)enchants.get(e), false);
 				}
 			}
 		}
-		
+
 		//Offensive
 		Player damager = event.GetDamagerPlayer(true);
 		if (damager != null)
@@ -390,9 +391,19 @@ public class DamageManager extends MiniPlugin
 				trajectory.multiply(0.6 * knockback);
 				trajectory.setY(Math.abs(trajectory.getY()));
 
+				//Debug
+				if (event.GetDamageeEntity() instanceof Player && UtilGear.isMat(((Player)event.GetDamageeEntity()).getItemInHand(), Material.SUGAR))
+				{
+					Bukkit.broadcastMessage("--------- " + 
+				UtilEnt.getName(event.GetDamageeEntity()) + " hurt by " + UtilEnt.getName(event.GetDamagerEntity(true)) + "-----------" );
+					
+					Bukkit.broadcastMessage(F.main("Debug", "Damage: " + event.GetDamage()));
+				}
+
+
 				//Apply
 				double vel = 0.2 + trajectory.length() * 0.8;
-				
+
 				UtilAction.velocity(event.GetDamageeEntity(), trajectory, vel, 
 						false, 0, Math.abs(0.2 * knockback), 0.4 + (0.04 * knockback), true);
 			}
@@ -411,6 +422,15 @@ public class DamageManager extends MiniPlugin
 		}
 	}
 
+	@EventHandler
+	public void debugVel2(PlayerVelocityEvent event)
+	{
+		if (UtilGear.isMat(((Player)event.getPlayer()).getItemInHand(), Material.SUGAR))
+		{
+			Bukkit.broadcastMessage(F.main("Debug", "Event: " + event.getVelocity().length()));
+		}
+	}
+
 	private void DisplayDamage(CustomDamageEvent event) 
 	{
 		for (Player player : UtilServer.getPlayers())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 0c4f1f519..bad4fd5a9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -209,7 +209,7 @@ public abstract class Game implements Listener
 	
 	public int TickPerTeleport = 1;
 	
-	public int EnforceTeamSize = -1;
+	public int FillTeamsInOrderToCount = -1;
 	
 	public boolean SpawnNearAllies = false;
 	public boolean SpawnNearEnemies = false;
@@ -618,11 +618,11 @@ public abstract class Game implements Listener
 
 	public GameTeam ChooseTeam(Player player)
 	{
-		if (EnforceTeamSize != -1)
+		if (FillTeamsInOrderToCount != -1)
 		{
 			for (int i = 0; i < _teamList.size(); i++)
 			{
-				if (_teamList.get(i).GetSize() < EnforceTeamSize)
+				if (_teamList.get(i).GetSize() < FillTeamsInOrderToCount)
 				{
 					return _teamList.get(i);
 				}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 9efb5366c..5d7242622 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -46,6 +46,7 @@ public class TeamSkywars extends Skywars
 					"Last team alive wins!"
 							});
 		
+		this.FillTeamsInOrderToCount = 2;
 	}
 	
 	@EventHandler
@@ -169,16 +170,34 @@ public class TeamSkywars extends Skywars
 
 		Scoreboard.WriteBlank();
 		Scoreboard.Write(C.cYellow + C.Bold + "Teams");
-		if (GetTeamList().size() <= 4)
+		
+		ArrayList<GameTeam> alive = new ArrayList<GameTeam>();
+		for (GameTeam team : GetTeamList())
 		{
-			for(GameTeam team : GetTeamList())
+			if (team.IsTeamAlive())
+				alive.add(team);
+		}
+		
+		if (GetPlayers(true).size() <= 4)
+		{
+			for (GameTeam team : GetTeamList())
 			{
-				Scoreboard.Write(team.GetColor() + team.GetName() + " " + team.GetSize());
+				for (Player player : team.GetPlayers(true))
+				{
+					Scoreboard.Write(team.GetColor() + player.getName());
+				}
 			}
-		} 
+		}
+		else if (alive.size() <= 4)
+		{
+			for (GameTeam team : alive)
+			{
+				Scoreboard.Write(C.cWhite + team.GetPlayers(true).size() + " " + team.GetColor() + team.GetName());
+			}
+		}
 		else
 		{
-			Scoreboard.Write(C.cYellow + "Players " + GetPlayers(true).size());
+			Scoreboard.Write(C.cWhite + alive.size() + " Alive");
 		}
 		
 		if (IsLive())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 039f8349d..7adb4a1b4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilPlayer;
@@ -45,7 +46,7 @@ public class TeamSuperSmash extends SuperSmash
 						});
 		
 		this.PlayersPerTeam = 2;
-		this.EnforceTeamSize = 2;
+		this.FillTeamsInOrderToCount = 2;
 	}
 
 	@Override
@@ -55,37 +56,48 @@ public class TeamSuperSmash extends SuperSmash
 		if (event.getType() != UpdateType.FAST)
 			return;
 
+		ArrayList<GameTeam> alive = new ArrayList<GameTeam>();
+		for (GameTeam team : GetTeamList())
+		{
+			if (team.IsTeamAlive())
+				alive.add(team);
+		}
+		
 		//Wipe Last
 		Scoreboard.Reset();
-
-		if (GetPlayers(true).size() > 14)
+		Scoreboard.WriteBlank();
+		
+		if (GetPlayers(true).size() < 16)
 		{
-			for (GameTeam team : this.GetTeamList())
+			
+			for (GameTeam team : GetTeamList())
 			{
-				Scoreboard.WriteBlank();
-				Scoreboard.Write(team.GetFormattedName());
-				
-				int lives = 0;
 				for (Player player : team.GetPlayers(true))
+				{
+					int lives = GetLives(player);
+					
+					Scoreboard.Write(C.cWhite + lives + " " + team.GetColor() + player.getName());
+				}
+			}
+		}
+		else if (alive.size() < 16)
+		{
+			for (GameTeam team : alive)
+			{
+				int lives = 0;
+			
+				for (Player player : team.GetPlayers(true))
+				{
 					lives += GetLives(player);
+				}
 				
-				Scoreboard.Write(team.GetColor() + "" + lives + " Lives");
+				Scoreboard.Write(C.cWhite + lives + " " + team.GetColor() + team.GetName());
 			}
 		}
 		else
 		{
-			Scoreboard.WriteBlank();
-			
-			//Write New
-			for (Player player : GetPlayers(true))
-			{
-				int lives = GetLives(player);
-				
-				if (lives <= 0)	
-					continue;
-				
-				Scoreboard.WriteOrdered("Lives", GetTeam(player).GetColor() + player.getName(), lives, true);
-			}
+			Scoreboard.Write(C.cYellow + C.Bold + "Teams Alive");
+			Scoreboard.Write(C.cWhite + alive.size());
 		}
 		
 		Scoreboard.Draw();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 53843827f..9feb0ae5c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -27,6 +27,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scoreboard.Team;
 
 public class TeamSurvivalGames extends SurvivalGames
 {
@@ -49,7 +50,7 @@ public class TeamSurvivalGames extends SurvivalGames
 								});
 		
 		this.PlayersPerTeam = 2;
-		this.EnforceTeamSize = 2;
+		this.FillTeamsInOrderToCount = 2;
 		
 	}
 	
@@ -146,19 +147,36 @@ public class TeamSurvivalGames extends SurvivalGames
 		Scoreboard.Write(UtilTime.convertString(this.getSecondsSinceStart() * 1000, 0, TimeUnit.FIT));
 
 		Scoreboard.WriteBlank();
-
 		Scoreboard.Write(C.cYellow + C.Bold + "Teams");
-		if (GetTeamList().size() > 7)
+		
+		ArrayList<GameTeam> alive = new ArrayList<GameTeam>();
+		for (GameTeam team : GetTeamList())
 		{
-			Scoreboard.Write("" + GetTeamList().size());
+			if (team.IsTeamAlive())
+				alive.add(team);
 		}
-		else
+
+		if (GetPlayers(true).size() <= 7)
 		{
 			for (GameTeam team : GetTeamList())
 			{
-				Scoreboard.Write(C.cWhite + team.GetColor() + team.GetName());
+				for (Player player : team.GetPlayers(true))
+				{
+					Scoreboard.Write(team.GetColor() + player.getName());
+				}
 			}
 		}
+		else if (alive.size() <= 7)
+		{
+			for (GameTeam team : alive)
+			{
+				Scoreboard.Write(C.cWhite + team.GetPlayers(true).size() + " " + team.GetColor() + team.GetName());
+			}
+		}
+		else
+		{
+			Scoreboard.Write(C.cWhite + alive.size() + " Alive");
+		}
 
 		Scoreboard.WriteBlank();
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index c429869b4..e5799a30b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -334,7 +334,7 @@ public class GameLobbyManager implements Listener, IPacketHandler
 		}
 				
 		//Standard
-		if (game.GetKits().length > 1 || game.GetTeamList().size() < 6)
+		if ((game.GetKits().length > 1 || game.GetTeamList().size() < 6) && game.GetType() != GameType.SurvivalGamesTeams)
 		{
 			//Display
 			ArrayList<GameTeam> teams = new ArrayList<GameTeam>();

From 5e05530b1d2a61d18ad031b6742fecf0e8625ff7 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Fri, 17 Jul 2015 21:28:46 +1000
Subject: [PATCH 029/113] spawn near allies!

---
 .../nautilus/game/arcade/game/games/skywars/TeamSkywars.java   | 2 ++
 .../nautilus/game/arcade/game/games/smash/TeamSuperSmash.java  | 2 ++
 .../arcade/game/games/survivalgames/TeamSurvivalGames.java     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 5d7242622..11aed9bfb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -47,6 +47,8 @@ public class TeamSkywars extends Skywars
 							});
 		
 		this.FillTeamsInOrderToCount = 2;
+		
+		this.SpawnNearAllies = true;
 	}
 	
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 7adb4a1b4..3fece88bf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -47,6 +47,8 @@ public class TeamSuperSmash extends SuperSmash
 		
 		this.PlayersPerTeam = 2;
 		this.FillTeamsInOrderToCount = 2;
+		
+		this.SpawnNearAllies = true;
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 9feb0ae5c..497c9a6d4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -52,6 +52,9 @@ public class TeamSurvivalGames extends SurvivalGames
 		this.PlayersPerTeam = 2;
 		this.FillTeamsInOrderToCount = 2;
 		
+		this.SpawnNearAllies = true;
+		this.SpawnNearEnemies = true;
+		
 	}
 	
 	@EventHandler

From 8b26ffaecdeb7d0f3abe0db4ab780b50df9434d9 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 17 Jul 2015 14:05:27 +0200
Subject: [PATCH 030/113] Improving Team names in SG, SSM and Skywars and
 disabled friendly fire.

---
 .../game/games/skywars/SoloSkywars.java       | 17 ++++
 .../game/games/skywars/TeamSkywars.java       | 81 ++++++++++++------
 .../game/games/smash/SoloSuperSmash.java      | 17 ++++
 .../game/games/smash/TeamSuperSmash.java      | 81 ++++++++++++------
 .../survivalgames/SoloSurvivalGames.java      | 17 ++++
 .../survivalgames/TeamSurvivalGames.java      | 85 +++++++++++++------
 6 files changed, 219 insertions(+), 79 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
index 0fd06b72b..8da685ceb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -14,11 +15,15 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
 
 public class SoloSkywars extends Skywars
 {
 
+	private GameTeam _players;
+	
 	public SoloSkywars(ArcadeManager manager)
 	{
 		super(manager, GameType.Skywars, 
@@ -33,6 +38,18 @@ public class SoloSkywars extends Skywars
 		
 	}
 	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+			return;
+
+		_players = GetTeamList().get(0);
+		_players.SetColor(ChatColor.YELLOW);
+		_players.SetName("Players");
+		_players.setDisplayName(C.cYellow + C.Bold + "Players");
+	}
+	
 	@Override
 	@EventHandler
 	public void ScoreboardUpdate(UpdateEvent event)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 11aed9bfb..a74dee780 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -49,6 +49,8 @@ public class TeamSkywars extends Skywars
 		this.FillTeamsInOrderToCount = 2;
 		
 		this.SpawnNearAllies = true;
+		
+		this.DamageTeamSelf = false;
 	}
 	
 	@EventHandler
@@ -120,24 +122,26 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW),
-		GREEN(ChatColor.GREEN),
-		AQUA(ChatColor.AQUA),
-		DARK_RED(ChatColor.DARK_RED),
-		GOLD(ChatColor.GOLD),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
-		DARK_BLUE(ChatColor.DARK_BLUE),
-		WHITE(ChatColor.WHITE),
-		BLUE(ChatColor.BLUE),
-		DARK_GREEN(ChatColor.DARK_GREEN),
-		DARK_PURPLE(ChatColor.DARK_PURPLE),
-		DARK_AQUA(ChatColor.DARK_AQUA);
+		YELLOW(ChatColor.YELLOW, "Yellow"),
+		GREEN(ChatColor.GREEN, "Green"),
+		AQUA(ChatColor.AQUA, "Aqua"),
+		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
+		GOLD(ChatColor.GOLD, "Gold"),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
+		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
+		WHITE(ChatColor.WHITE, "White"),
+		BLUE(ChatColor.BLUE, "Blue"),
+		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
+		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
 		
 		private ChatColor color;
+		private String name;
 		
-		private TeamColors(ChatColor color)
+		private TeamColors(ChatColor color, String name)
 		{
 			this.color = color;
+			this.name = name;
 		}
 		
 		public ChatColor getColor()
@@ -145,6 +149,23 @@ public class TeamSkywars extends Skywars
 			return this.color;
 		}
 		
+		public String toString()
+		{
+			return this.name;
+		}
+		
+	}
+	
+	private String getColorName(ChatColor color)
+	{
+		for(TeamColors colors : TeamColors.values())
+		{
+			if(colors.getColor() == color)
+			{
+				return colors.toString();
+			}
+		}
+		return "";
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -314,19 +335,18 @@ public class TeamSkywars extends Skywars
 				continue;
 			}
 
-			String name = "";
-
-			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
 			{
-				Player player = team.GetPlayers(false).get(i);
-
-				name += player.getName();
-
-				if (i < team.GetPlayers(false).size() - 1)
-					name += " & ";
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
 			}
-
-			team.SetName(name);
+			
+			team.setDisplayName(i + " " + name);
 		}
 	}
 	
@@ -407,7 +427,18 @@ public class TeamSkywars extends Skywars
 			if (team == null)
 				return;
 				
-			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
+			{
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
+			}
+			
+			team.setDisplayName(i + " " + name);
 			
 			//Join Team
 			SetPlayerTeam(player, team, true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
index 93dc20790..493fd7e24 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -12,11 +13,15 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.Game.GameState;
 
 public class SoloSuperSmash extends SuperSmash
 {
 
+	private GameTeam _players;
+	
 	public SoloSuperSmash(ArcadeManager manager)
 	{
 		super(manager, GameType.Smash, new String[]
@@ -28,6 +33,18 @@ public class SoloSuperSmash extends SuperSmash
 		
 		this.DamageTeamSelf = true;
 	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+			return;
+
+		_players = GetTeamList().get(0);
+		_players.SetColor(ChatColor.YELLOW);
+		_players.SetName("Players");
+		_players.setDisplayName(C.cYellow + C.Bold + "Players");
+	}
 
 	@Override
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 3fece88bf..39989f20a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -15,7 +15,6 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -49,6 +48,7 @@ public class TeamSuperSmash extends SuperSmash
 		this.FillTeamsInOrderToCount = 2;
 		
 		this.SpawnNearAllies = true;
+		this.DamageTeamSelf = false;
 	}
 
 	@Override
@@ -141,24 +141,26 @@ public class TeamSuperSmash extends SuperSmash
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW),
-		GREEN(ChatColor.GREEN),
-		AQUA(ChatColor.AQUA),
-		DARK_RED(ChatColor.DARK_RED),
-		GOLD(ChatColor.GOLD),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
-		DARK_BLUE(ChatColor.DARK_BLUE),
-		WHITE(ChatColor.WHITE),
-		BLUE(ChatColor.BLUE),
-		DARK_GREEN(ChatColor.DARK_GREEN),
-		DARK_PURPLE(ChatColor.DARK_PURPLE),
-		DARK_AQUA(ChatColor.DARK_AQUA);
+		YELLOW(ChatColor.YELLOW, "Yellow"),
+		GREEN(ChatColor.GREEN, "Green"),
+		AQUA(ChatColor.AQUA, "Aqua"),
+		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
+		GOLD(ChatColor.GOLD, "Gold"),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
+		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
+		WHITE(ChatColor.WHITE, "White"),
+		BLUE(ChatColor.BLUE, "Blue"),
+		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
+		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
 		
 		private ChatColor color;
+		private String name;
 		
-		private TeamColors(ChatColor color)
+		private TeamColors(ChatColor color, String name)
 		{
 			this.color = color;
+			this.name = name;
 		}
 		
 		public ChatColor getColor()
@@ -166,6 +168,23 @@ public class TeamSuperSmash extends SuperSmash
 			return this.color;
 		}
 		
+		public String toString()
+		{
+			return this.name;
+		}
+		
+	}
+	
+	private String getColorName(ChatColor color)
+	{
+		for(TeamColors colors : TeamColors.values())
+		{
+			if(colors.getColor() == color)
+			{
+				return colors.toString();
+			}
+		}
+		return "";
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -262,19 +281,18 @@ public class TeamSuperSmash extends SuperSmash
 				continue;
 			}
 
-			String name = "";
-
-			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
 			{
-				Player player = team.GetPlayers(false).get(i);
-
-				name += player.getName();
-
-				if (i < team.GetPlayers(false).size() - 1)
-					name += " & ";
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
 			}
-
-			team.SetName(name);
+			
+			team.setDisplayName(i + " " + name);
 		}
 	}
 	
@@ -355,7 +373,18 @@ public class TeamSuperSmash extends SuperSmash
 			if (team == null)
 				return;
 				
-			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
+			{
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
+			}
+			
+			team.setDisplayName(i + " " + name);
 			
 			//Join Team
 			SetPlayerTeam(player, team, true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
index 8d025cd35..c036edcbb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
@@ -11,13 +11,18 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.Game.GameState;
 
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
 public class SoloSurvivalGames extends SurvivalGames
 {
+	
+	private GameTeam _players;
 
 	public SoloSurvivalGames(ArcadeManager manager)
 	{
@@ -36,6 +41,18 @@ public class SoloSurvivalGames extends SurvivalGames
 		this.DamageTeamSelf = true;
 		
 	}
+	
+	@EventHandler
+	public void CustomTeamGeneration(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+			return;
+
+		_players = GetTeamList().get(0);
+		_players.SetColor(ChatColor.YELLOW);
+		_players.SetName("Players");
+		_players.setDisplayName(C.cYellow + C.Bold + "Players");
+	}
 
 	@Override
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 497c9a6d4..f914fa886 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -17,7 +17,6 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.Game.GameState;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -27,7 +26,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scoreboard.Team;
 
 public class TeamSurvivalGames extends SurvivalGames
 {
@@ -55,6 +53,8 @@ public class TeamSurvivalGames extends SurvivalGames
 		this.SpawnNearAllies = true;
 		this.SpawnNearEnemies = true;
 		
+		this.DamageTeamSelf = false;
+		
 	}
 	
 	@EventHandler
@@ -94,24 +94,26 @@ public class TeamSurvivalGames extends SurvivalGames
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW),
-		GREEN(ChatColor.GREEN),
-		AQUA(ChatColor.AQUA),
-		DARK_RED(ChatColor.DARK_RED),
-		GOLD(ChatColor.GOLD),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE),
-		DARK_BLUE(ChatColor.DARK_BLUE),
-		WHITE(ChatColor.WHITE),
-		BLUE(ChatColor.BLUE),
-		DARK_GREEN(ChatColor.DARK_GREEN),
-		DARK_PURPLE(ChatColor.DARK_PURPLE),
-		DARK_AQUA(ChatColor.DARK_AQUA);
+		YELLOW(ChatColor.YELLOW, "Yellow"),
+		GREEN(ChatColor.GREEN, "Green"),
+		AQUA(ChatColor.AQUA, "Aqua"),
+		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
+		GOLD(ChatColor.GOLD, "Gold"),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
+		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
+		WHITE(ChatColor.WHITE, "White"),
+		BLUE(ChatColor.BLUE, "Blue"),
+		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
+		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
 		
 		private ChatColor color;
+		private String name;
 		
-		private TeamColors(ChatColor color)
+		private TeamColors(ChatColor color, String name)
 		{
 			this.color = color;
+			this.name = name;
 		}
 		
 		public ChatColor getColor()
@@ -119,6 +121,23 @@ public class TeamSurvivalGames extends SurvivalGames
 			return this.color;
 		}
 		
+		public String toString()
+		{
+			return this.name;
+		}
+		
+	}
+	
+	private String getColorName(ChatColor color)
+	{
+		for(TeamColors colors : TeamColors.values())
+		{
+			if(colors.getColor() == color)
+			{
+				return colors.toString();
+			}
+		}
+		return "";
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -286,19 +305,18 @@ public class TeamSurvivalGames extends SurvivalGames
 				continue;
 			}
 
-			String name = "";
-
-			for (int i = 0; i < team.GetPlayers(false).size(); i++)
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
 			{
-				Player player = team.GetPlayers(false).get(i);
-
-				name += player.getName();
-
-				if (i < team.GetPlayers(false).size() - 1)
-					name += " & ";
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
 			}
-
-			team.SetName(name);
+			
+			team.setDisplayName(i + " " + name);
 		}
 	}
 	
@@ -378,8 +396,19 @@ public class TeamSurvivalGames extends SurvivalGames
 			GameTeam team = getEmptyTeam();
 			if (team == null)
 				return;
-				
-			team.setDisplayName(player.getName() + " & " +  ally.getName());
+			
+			String name = team.GetColor() + getColorName(team.GetColor());
+			
+			int i = 1;
+			for(GameTeam teams : GetTeamList())
+			{
+				if(teams.GetName().startsWith(name))
+				{
+					i++;
+				}
+			}
+			
+			team.setDisplayName(i + " " + name);
 			
 			//Join Team
 			SetPlayerTeam(player, team, true);

From b986cf968e10b7ee71f44bd6c89fef2c7fcae1f3 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Sat, 18 Jul 2015 15:10:03 +0200
Subject: [PATCH 031/113] Added new kits, Changed Compass feature, Fixed a lot
 of bugs

---
 .../arcade/game/games/wither/WitherGame.java  | 273 +++++++++++++++---
 .../game/games/wither/kit/KitHumanArcher.java |  34 +--
 .../games/wither/kit/KitHumanBuilder.java     |  65 -----
 .../games/wither/kit/KitWitherMinion.java     |  99 ++++---
 4 files changed, 303 insertions(+), 168 deletions(-)
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index bbe50ac57..539bcfe83 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -1,40 +1,28 @@
 package nautilus.game.arcade.game.games.wither;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.EntityEffect;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.ThrownPotion;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.EntityCombustEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.Vector;
-
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.data.BlockData;
+import mineplex.core.itemstack.ItemBuilder;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
@@ -43,13 +31,48 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.GameTeam.PlayerState;
+import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.games.paintball.PlayerCopy;
-import nautilus.game.arcade.game.games.wither.kit.*;
+import nautilus.game.arcade.game.games.wither.events.HumanReviveEvent;
+import nautilus.game.arcade.game.games.wither.kit.KitHumanArcher;
+import nautilus.game.arcade.game.games.wither.kit.KitHumanMedic;
+import nautilus.game.arcade.game.games.wither.kit.KitHumanEditor;
+import nautilus.game.arcade.game.games.wither.kit.KitWitherMinion;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.NullKit;
 import nautilus.game.arcade.kit.perks.data.IBlockRestorer;
+import nautilus.game.arcade.stats.WitherAssaultReviveTracker;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.EntityEffect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkull;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
 
 public class WitherGame extends TeamGame implements IBlockRestorer
 {
@@ -59,6 +82,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	private double _witherFactor = 2.5;
 
 	private int _yLimit = 0;
+	private int _maxY;
 
 	private long _gameTime = 300000;
 
@@ -68,6 +92,8 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	// private HashMap<Player, Integer> _lives = new HashMap<Player, Integer>();
 
 	private HashSet<BlockData> _blocks = new HashSet<BlockData>();
+	
+	private ArrayList<Location> _locationsOfBlocks = new ArrayList<Location>();
 
 	public WitherGame(ArcadeManager manager)
 	{
@@ -75,24 +101,22 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		new Kit[]
 		{
-				new KitHumanArcher(manager), new NullKit(manager),
-				new NullKit(manager), new NullKit(manager),
+				new KitHumanArcher(manager),
+				new KitHumanMedic(manager),
+				new KitHumanEditor(manager),
+				new NullKit(manager),
 				new KitWitherMinion(manager),
 		},
 
 		new String[]
 		{
 
-				C.cGreen + "Humans" + C.cWhite
-						+ "  Run and hide from the Withers",
+				C.cGreen + "Humans" + C.cWhite + "  Run and hide from the Withers",
 				C.cGreen + "Humans" + C.cWhite + "  Revive your dead allies!",
-				C.cGreen + "Humans" + C.cWhite
-						+ "  Win by surviving for 5 minutes",
+				C.cGreen + "Humans" + C.cWhite + "  Win by surviving for 5 minutes",
 				" ",
-				C.cRed + "Withers" + C.cWhite
-						+ "  Moves very slowly when near ground",
-				C.cRed + "Withers" + C.cWhite
-						+ "  Kill all the Humans within 5 Minutes",
+				C.cRed + "Withers" + C.cWhite + "  Moves very slowly when near ground",
+				C.cRed + "Withers" + C.cWhite + "  Kill all the Humans within 5 Minutes",
 		});
 
 		this.DeathOut = true;
@@ -101,9 +125,12 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		this.DeathSpectateSecs = 4;
 		this.HungerSet = 20;
 		this.WorldBoundaryKill = false;
-
-		this.CompassEnabled = true;
-		this.CompassGiveItem = false;
+		this.CompassEnabled = false;
+		
+		//Customizing for the Editor kit
+		this.BlockBreak = true;
+		this.BlockPlace = true;
+		this.ItemPickup = true;
 
 		this.KitRegisterState = GameState.Prepare;
 
@@ -112,9 +139,13 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		_help = new String[]
 		{
-			C.cRed + C.Bold + "This game is still under development!",
+			"This game will soon not be under development anymore ;)",
+			"Blocks placed by an Editor can be passed by other humans by " + C.cDGreen + "Right-clicking the block",
+			"Withers are too powerful to be killed. Hiding is the only option!",
+			"Medics are a valuable asset. Stick with them and keep them safe!",
 
 		};
+		
 	}
 
 	@Override
@@ -177,6 +208,151 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		setWither(player, true);
 	}
 
+//	@EventHandler
+//	public void assignCompassOnStart(GameStateChangeEvent event)
+//	{
+//		if (event.GetState() != GameState.Live)
+//			return;
+//
+//		for (Player players : _withers.GetPlayers(true))
+//		{
+//			ItemStack compass = new ItemBuilder(Material.COMPASS, 1).build();
+//
+//			ItemMeta im = compass.getItemMeta();
+//			im.setLore(new ArrayList<String>(Arrays.asList(
+//					F.item("A compass that trigger"),
+//					F.item("your ability to track humans!"))));
+//			im.setDisplayName(F.name("Scent Trigger"));
+//
+//			compass.setItemMeta(im);
+//
+//			players.getInventory().setItem(7, compass);
+//		}
+//	}
+
+	// Cancel wither shooting in waiting lobby
+	@EventHandler
+	public void onWitherSkullFire(ProjectileLaunchEvent event)
+	{
+		if (GetState() == GameState.Recruit || GetState() == GameState.Prepare)
+		{
+			Projectile proj = event.getEntity();
+			WitherSkull ws = (WitherSkull) proj;
+
+			if (ws.getShooter() instanceof Wither)
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+	
+	@EventHandler
+	public void handleCustomBlockPlace(BlockPlaceEvent event)
+	{
+		if(!IsLive())
+		{
+			return;
+		}
+		if(!GetKit(event.getPlayer()).GetName().contentEquals("Human Editor"))
+		{
+			event.setCancelled(true);
+			return;
+		}
+		
+		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 5;
+		if(event.getBlock().getLocation().getBlockY() < _maxY)
+		{
+			event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
+			event.setCancelled(true);
+			return;
+		}
+		
+		_locationsOfBlocks.add(event.getBlock().getLocation());
+	}
+	
+	@EventHandler
+	public void handleCustomBlockbreak(BlockBreakEvent event)
+	{
+		if(!IsLive())
+		{
+			return;
+		}
+		if(!GetKit(event.getPlayer()).GetName().contentEquals("Human Editor"))
+		{
+			event.setCancelled(true);
+			return;
+		}
+		
+		Location blockLocation = event.getBlock().getLocation();
+		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 4;
+		if(blockLocation.add(0,1,0).getBlock().getType() == Material.AIR)
+		{
+			for(Player humans: _runners.GetPlayers(true))
+			{
+				if(IsAlive(humans))
+				{
+					if(humans.getLocation().add(0,-1,0).getBlock().equals(event.getBlock()))
+					{
+						if(humans.getName() != event.getPlayer().getName())
+						{
+							event.setCancelled(true);
+							return;
+						}
+					}
+				}
+			}
+		}
+		
+		if(blockLocation.getBlockY() < _maxY)
+		{
+			event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
+			event.setCancelled(true);
+			return;
+		}
+	}
+	
+	@EventHandler
+	public void handleCustomItemPickup(PlayerPickupItemEvent event)
+	{
+		if(!IsLive())
+		{
+			return;
+		}
+		if(!GetKit(event.getPlayer()).GetName().contentEquals("Human Editor"))
+		{
+			event.setCancelled(true);
+			return;
+		}
+	}
+	
+	//On Player interact with a placed block by Editor
+	@EventHandler
+	public void onPlayerInteract(PlayerInteractEvent event)
+	{
+		if(!IsLive())
+		{
+			return;
+		}
+		if(!IsAlive(event.getPlayer()))
+		{
+			return;
+		}
+		if(event.getAction() == Action.RIGHT_CLICK_BLOCK)
+		{
+			Block clickedBlock = event.getClickedBlock();
+			
+			if(_locationsOfBlocks.contains(clickedBlock.getLocation()))
+			{
+				if(!(event.getPlayer().getInventory().getItem(event.getPlayer().getInventory().getHeldItemSlot()) instanceof Block))
+				{
+					UtilParticle.PlayParticle(ParticleType.FLAME, event.getClickedBlock().getLocation().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1, ViewDist.LONG, UtilServer.getPlayers());
+					event.getClickedBlock().getWorld().playSound(event.getClickedBlock().getLocation(), Sound.NOTE_STICKS, 2f, 1f);
+					Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, event.getClickedBlock().getData(), 2000);
+				}
+			}
+		}
+	}
+
 	public void setWither(Player player, boolean forced)
 	{
 		// _lives.remove(player);
@@ -184,7 +360,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		SetPlayerTeam(player, _withers, true);
 
 		// Kit
-		Kit newKit = GetKits()[4];
+		Kit newKit = GetKits()[GetKits().length-1];
 
 		SetKit(player, newKit, false);
 		newKit.ApplyKit(player);
@@ -244,6 +420,24 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 							false);
 		}
 	}
+	
+	@EventHandler
+	public void removeUselessPlayerCopies(UpdateEvent event)
+	{
+		if(event.getType() != UpdateType.TWOSEC)
+		return;
+		
+		for(Player players: _doubles.keySet())
+		{
+			if(!players.isOnline())
+			{
+				PlayerCopy pc = _doubles.get(players);
+				pc.GetEntity().remove();
+				_doubles.remove(players);
+			}
+		}
+		
+	}
 
 	// @EventHandler
 	// public void playerLivesDisplay(PlayerKitGiveEvent event)
@@ -272,9 +466,10 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			return;
 
 		// Players Quit
-		if (GetPlayers(true).size() < 2)
+		if (GetPlayers(true).size() < 1)
 		{
 			SetState(GameState.End);
+			_locationsOfBlocks.clear();
 		}
 
 		GameTeam winner = null;
@@ -307,6 +502,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 			// End
 			SetState(GameState.End);
+			_locationsOfBlocks.clear();
 		}
 	}
 
@@ -390,6 +586,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		for (Player player : _withers.GetPlayers(true))
 		{
 			ArrayList<Location> collisions = new ArrayList<Location>();
+			_maxY = GetTeamList().get(1).GetSpawn().getBlockY();
 
 			// Fly Speed
 			double speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006;
@@ -569,7 +766,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		_doubles.put(player, new PlayerCopy(this, player, ChatColor.YELLOW));
 	}
-
+	
 	public void playerIn(final Player player, final LivingEntity copy)
 	{
 		// State
@@ -662,6 +859,8 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			copyIterator.remove();
 
 			AddGems(thrower, 3, "Revived Ally", true, true);
+			
+			Bukkit.getPluginManager().callEvent(new HumanReviveEvent(thrower, copy.GetPlayer()));
 		}
 
 		// Revive
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java
index 5fb97dbe3..bfdbbb8ba 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java
@@ -24,22 +24,20 @@ public class KitHumanArcher extends Kit
 {
 	public KitHumanArcher(ArcadeManager manager)
 	{
-		super(manager, "Human Archer", KitAvailability.Free, 
+		super(manager, "Human Archer", KitAvailability.Free,
 
-				new String[] 
-						{
-				""
-						}, 
+		new String[]
+		{
+			""
+		},
 
-						new Perk[] 
-								{
+		new Perk[]
+		{
 				new PerkDoubleJump("Double Jump", 1.2, 1, true, 4000, true),
 				new PerkWitherArrowBlind(6),
 				new PerkFletcher(4, 4, true),
-				
-								}, 
-								EntityType.ZOMBIE,
-								null);
+
+		}, EntityType.ZOMBIE, null);
 
 	}
 
@@ -48,20 +46,20 @@ public class KitHumanArcher extends Kit
 	{
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD));
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
-		
-		ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422
-		PotionMeta potionMeta = (PotionMeta)potion.getItemMeta();
+
+		ItemStack potion = new ItemStack(Material.POTION, 2, (short) 16429); // 16422
+		PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
 		potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
 		potion.setItemMeta(potionMeta);
 		player.getInventory().addItem(potion);
-		
+
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 	}
-	
+
 	@Override
-	public void SpawnCustom(LivingEntity ent) 
+	public void SpawnCustom(LivingEntity ent)
 	{
-		
+
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java
deleted file mode 100644
index d6c168aa4..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package nautilus.game.arcade.game.games.wither.kit;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.PotionMeta;
-
-import mineplex.core.disguise.disguises.DisguisePlayer;
-import mineplex.core.itemstack.ItemStackFactory;
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.kit.Kit;
-import nautilus.game.arcade.kit.KitAvailability;
-import nautilus.game.arcade.kit.Perk;
-import nautilus.game.arcade.kit.perks.PerkBlockRestorer;
-import nautilus.game.arcade.kit.perks.PerkDoubleJump;
-import nautilus.game.arcade.kit.perks.PerkIronShell;
-
-public class KitHumanBuilder extends Kit
-{
-	public KitHumanBuilder(ArcadeManager manager)
-	{
-		super(manager, "Human Builder", KitAvailability.Free, 
-
-				new String[] 
-						{
-				""
-						}, 
-
-						new Perk[] 
-								{
-				new PerkDoubleJump("Double Jump", 1, 0.8, true, 6000, true),
-				new PerkIronShell(),
-				new PerkBlockRestorer()
-								}, 
-								EntityType.ZOMBIE,
-								null);
-
-	}
-
-	@Override
-	public void GiveItems(Player player)
-	{
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE));
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE));
-		
-		ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422
-		PotionMeta potionMeta = (PotionMeta)potion.getItemMeta();
-		potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
-		potion.setItemMeta(potionMeta);
-		player.getInventory().addItem(potion);
-		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
-	}
-	
-	@Override
-	public void SpawnCustom(LivingEntity ent) 
-	{
-		
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java
index 72a3e93de..92c03e455 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java
@@ -26,57 +26,60 @@ public class KitWitherMinion extends Kit
 {
 	public KitWitherMinion(ArcadeManager manager)
 	{
-		super(manager, "Wither", KitAvailability.Free, 
+		super(manager, "Wither", KitAvailability.Free,
 
-				new String[] 
-						{
-				""
-						}, 
+		new String[]
+		{
+			""
+		},
 
-						new Perk[] 
-								{
-				new PerkWitherArrows(),	
-				new PerkWitherAttack(),
-				new PerkWitherMinion()
-								}, 
-								EntityType.WITHER,
-								null);
+		new Perk[]
+		{
+				new PerkWitherArrows(), new PerkWitherAttack(),
+				new PerkWitherMinion(), new PerkWitherCompassScent()
+		}, EntityType.WITHER, null);
 
 	}
-	
-//	@Override
-//	public void SpawnCustom(LivingEntity ent) 
-//	{
-//		ent.setMaxHealth(300);
-//		ent.setHealth(300);
-//		
-//		DisguiseWither disguise = new DisguiseWither(ent);
-//		disguise.SetName(C.cYellow + "Wither");
-//		disguise.SetCustomNameVisible(true);
-//		Manager.GetDisguise().disguise(disguise);
-//	}
-	
-	
+
+	// @Override
+	// public void SpawnCustom(LivingEntity ent)
+	// {
+	// ent.setMaxHealth(300);
+	// ent.setHealth(300);
+	//
+	// DisguiseWither disguise = new DisguiseWither(ent);
+	// disguise.SetName(C.cYellow + "Wither");
+	// disguise.SetCustomNameVisible(true);
+	// Manager.GetDisguise().disguise(disguise);
+	// }
 
 	@Override
-	public void GiveItems(Player player) 
-	{		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, 
-				C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wither Skull"));
-		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD, (byte)0, 1, 
-				C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Skeletal Minions"));
-		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.COMPASS, (byte)0, 1, 
-				C.cYellow + C.Bold + "Human Finder X-9000"));
+	public void GiveItems(Player player)
+	{
+		player.getInventory().addItem(
+				ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD,
+						(byte) 0, 1, C.cYellow + C.Bold + "Left-Click"
+								+ C.cWhite + C.Bold + " - " + C.cGreen + C.Bold
+								+ "Wither Skull"));
 
-		//Disguise
+		player.getInventory().addItem(
+				ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD,
+						(byte) 0, 1, C.cYellow + C.Bold + "Right-Click"
+								+ C.cWhite + C.Bold + " - " + C.cGreen + C.Bold
+								+ "Skeletal Minions"));
+
+		player.getInventory().addItem(
+				ItemStackFactory.Instance
+						.CreateStack(Material.COMPASS, (byte) 0, 1, C.cYellow
+								+ C.Bold + "Human Finder X-9000"));
+
+		// Disguise
 		DisguiseWither disguise = new DisguiseWither(player);
 
-		if (Manager.GetGame().GetTeam(player) != null)		
-			disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
-		else			
-			disguise.setName(player.getName());
+		if (Manager.GetGame().GetTeam(player) != null)
+			disguise.setName(Manager.GetGame().GetTeam(player).GetColor()
+					+ player.getName());
+		else disguise.setName(player.getName());
 
 		disguise.setCustomNameVisible(true);
 		Manager.GetDisguise().disguise(disguise);
@@ -87,25 +90,25 @@ public class KitWitherMinion extends Kit
 	{
 		if (event.IsCancelled())
 			return;
-		
+
 		Player player = event.GetDamageePlayer();
 		if (player == null)
 			return;
-		
+
 		if (HasKit(player))
 			event.SetCancelled("Wither Immunity");
 	}
-	
+
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void witherMeleeCancel(CustomDamageEvent event)
 	{
 		if (event.IsCancelled())
 			return;
-		
+
 		Player player = event.GetDamagerPlayer(true);
 		if (player == null)
 			return;
-		
+
 		if (!HasKit(player))
 			return;
 
@@ -120,7 +123,7 @@ public class KitWitherMinion extends Kit
 	{
 		if (event.getType() != UpdateType.TICK)
 			return;
-		
+
 		for (Player player : UtilServer.getPlayers())
 		{
 			if (!HasKit(player))

From 2cad6223a7e2185fb90cd14d6799f82082b5b239 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Sat, 18 Jul 2015 15:15:53 +0200
Subject: [PATCH 032/113] Ubs.. Forgot to actually upload the new kits.. :D

---
 .../games/wither/events/HumanReviveEvent.java | 36 ++++++++++
 .../game/games/wither/kit/KitHumanEditor.java | 49 ++++++++++++++
 .../game/games/wither/kit/KitHumanMedic.java  | 66 +++++++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/events/HumanReviveEvent.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/events/HumanReviveEvent.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/events/HumanReviveEvent.java
new file mode 100644
index 000000000..6cc0be5e6
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/events/HumanReviveEvent.java
@@ -0,0 +1,36 @@
+package nautilus.game.arcade.game.games.wither.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+public class HumanReviveEvent extends PlayerEvent
+{
+	private static final HandlerList handlers = new HandlerList();
+
+	public static HandlerList getHandlerList()
+	{
+		return handlers;
+	}
+
+	@Override
+	public HandlerList getHandlers()
+	{
+		return getHandlerList();
+	}
+
+	private final Player _revivedPlayer;
+
+	public HumanReviveEvent(Player who, Player revivedPlayer)
+	{
+		super(who);
+
+		_revivedPlayer = revivedPlayer;
+	}
+
+	public Player getRevivedPlayer()
+	{
+		return _revivedPlayer;
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
new file mode 100644
index 000000000..639f53f50
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
@@ -0,0 +1,49 @@
+package nautilus.game.arcade.game.games.wither.kit;
+
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+
+public class KitHumanEditor extends Kit
+{
+	public KitHumanEditor(ArcadeManager manager)
+	{
+		super(manager, "Human Editor", KitAvailability.Gem, 5000,
+		new String[]
+		{
+				" ", "Can " + C.cYellow + "Edit " + C.cGray + "the terrain to him and his comrade's benefits", " "
+		}, 
+		new Perk[]
+		{
+			
+		},
+		EntityType.ZOMBIE, new ItemStack(Material.STONE_PICKAXE));
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_PICKAXE));
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_SPADE));
+
+		ItemStack potion = new ItemStack(Material.POTION, 2, (short) 16429); // 16422
+		PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
+		potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
+		potion.setItemMeta(potionMeta);
+		player.getInventory().addItem(potion);
+
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java
new file mode 100644
index 000000000..152c566b4
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java
@@ -0,0 +1,66 @@
+package nautilus.game.arcade.game.games.wither.kit;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+
+import mineplex.core.disguise.disguises.DisguisePlayer;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkBlockRestorer;
+import nautilus.game.arcade.kit.perks.PerkDoubleJump;
+import nautilus.game.arcade.kit.perks.PerkIronShell;
+import nautilus.game.arcade.kit.perks.PerkWitherMedicRefill;
+
+public class KitHumanMedic extends Kit
+{
+	public KitHumanMedic(ArcadeManager manager)
+	{
+		super(manager, "Human Medic", KitAvailability.Gem, 2000, 
+
+				new String[] 
+						{
+				""
+						}, 
+
+						new Perk[] 
+								{
+				new PerkDoubleJump("Double Jump", 1, 0.8, true, 6000, true),
+				new PerkWitherMedicRefill(45, 1),
+				new PerkBlockRestorer()
+								}, 
+								EntityType.ZOMBIE,
+								null);
+
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE));
+		
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
+		
+		ItemStack potion = new ItemStack(Material.POTION, 1, (short)16429); // 16422
+		PotionMeta potionMeta = (PotionMeta)potion.getItemMeta();
+		potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
+		potion.setItemMeta(potionMeta);
+		player.getInventory().addItem(potion);
+		
+	}
+	
+	@Override
+	public void SpawnCustom(LivingEntity ent) 
+	{
+		
+	}
+}

From c5f7c4fe0ecb2a1b8d407fc2677f53c7a57e82ee Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Sun, 19 Jul 2015 19:50:53 +0200
Subject: [PATCH 033/113] Finalized after QA testing. Pretty much ready to go

---
 .../arcade/game/games/wither/WitherGame.java  | 67 ++++++++++++-------
 .../game/games/wither/kit/KitHumanEditor.java |  5 +-
 .../game/games/wither/kit/KitHumanMedic.java  |  2 +-
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index 539bcfe83..4b89e2bcb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -259,7 +259,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			return;
 		}
 		
-		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 5;
+		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 4;
 		if(event.getBlock().getLocation().getBlockY() < _maxY)
 		{
 			event.getPlayer().sendMessage(F.main("BlockChecker", "You may not build under this height!"));
@@ -284,7 +284,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		}
 		
 		Location blockLocation = event.getBlock().getLocation();
-		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 4;
+		_maxY = GetTeamList().get(1).GetSpawn().getBlockY() - 3;
 		if(blockLocation.add(0,1,0).getBlock().getType() == Material.AIR)
 		{
 			for(Player humans: _runners.GetPlayers(true))
@@ -583,19 +583,33 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (event.getType() != UpdateType.FASTER)
 			return;
 
+		Location _spawn = GetTeamList().get(1).GetSpawn();
 		for (Player player : _withers.GetPlayers(true))
 		{
 			ArrayList<Location> collisions = new ArrayList<Location>();
-			_maxY = GetTeamList().get(1).GetSpawn().getBlockY();
 
 			// Fly Speed
-			double speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006;
+			
+			double distanceToGround = player.getLocation().distance(new Location(_spawn.getWorld(), player.getLocation().getX(), _spawn.getY(), player.getLocation().getZ()));
+			double speed;
 
-			if (speed > 0.16)
+			if (distanceToGround < 8)
+			{
 				speed = 0.16;
+			}
+			else
+			{
+				speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006;
+			}
 
-			if (speed < 0.016)
+			if (distanceToGround < 4)
+			{
 				speed = 0.016;
+			}
+			else
+			{
+				speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006;
+			}
 
 			player.setFlySpeed((float) speed);
 
@@ -767,7 +781,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		_doubles.put(player, new PlayerCopy(this, player, ChatColor.YELLOW));
 	}
 	
-	public void playerIn(final Player player, final LivingEntity copy)
+	public void playerIn(final Player player, final LivingEntity copy, Player revivedBy)
 	{
 		// State
 		SetPlayerState(player, PlayerState.IN);
@@ -794,7 +808,14 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		player.getInventory().remove(Material.COMPASS);
 
 		// Inform
-		UtilPlayer.message(player, F.main("Game", "You have been revived!"));
+		if(revivedBy != null)
+		{
+			UtilPlayer.message(player, F.main("Game", "You have been revived by " + C.cGold + revivedBy.getName()));
+		}
+		else
+		{
+			UtilPlayer.message(player, F.main("Game", "You have been revived!"));
+		}
 
 		// Delayed Visibility
 		if (copy != null)
@@ -841,7 +862,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		if (throwerTeam == null)
 			return;
 
-		// Revive
+		// Revive a copy
 		Iterator<PlayerCopy> copyIterator = _doubles.values().iterator();
 		while (copyIterator.hasNext())
 		{
@@ -855,7 +876,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 					event.getEntity().getLocation()) > 3)
 				continue;
 
-			playerIn(copy.GetPlayer(), copy.GetEntity());
+			playerIn(copy.GetPlayer(), copy.GetEntity(), thrower);
 			copyIterator.remove();
 
 			AddGems(thrower, 3, "Revived Ally", true, true);
@@ -863,19 +884,19 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 			Bukkit.getPluginManager().callEvent(new HumanReviveEvent(thrower, copy.GetPlayer()));
 		}
 
-		// Revive
-		for (Player player : GetPlayers(true))
-		{
-			GameTeam otherTeam = GetTeam(player);
-			if (otherTeam == null || !otherTeam.equals(throwerTeam))
-				continue;
-
-			if (UtilMath.offset(player.getLocation().add(0, 1, 0), event
-					.getEntity().getLocation()) > 3)
-				continue;
-
-			playerIn(player, null);
-		}
+		// Revive a player
+//		for (Player player : GetPlayers(true))
+//		{
+//			GameTeam otherTeam = GetTeam(player);
+//			if (otherTeam == null || !otherTeam.equals(throwerTeam))
+//				continue;
+//
+//			if (UtilMath.offset(player.getLocation().add(0, 1, 0), event
+//					.getEntity().getLocation()) > 3)
+//				continue;
+//
+//			playerIn(player, null, thrower);
+//		}
 	}
 
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
index 639f53f50..25c0098b1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanEditor.java
@@ -6,6 +6,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkDoubleJump;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -21,11 +22,11 @@ public class KitHumanEditor extends Kit
 		super(manager, "Human Editor", KitAvailability.Gem, 5000,
 		new String[]
 		{
-				" ", "Can " + C.cYellow + "Edit " + C.cGray + "the terrain to him and his comrade's benefits", " "
+				" ", "Can " + C.cYellow + "Edit " + C.cGray + "the terrain to they and their comrade's benefits", " "
 		}, 
 		new Perk[]
 		{
-			
+				new PerkDoubleJump("Double Jump", 1, 0.8, true, 6000, true),
 		},
 		EntityType.ZOMBIE, new ItemStack(Material.STONE_PICKAXE));
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java
index 152c566b4..095fcbb97 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanMedic.java
@@ -50,7 +50,7 @@ public class KitHumanMedic extends Kit
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP));
 		
-		ItemStack potion = new ItemStack(Material.POTION, 1, (short)16429); // 16422
+		ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422
 		PotionMeta potionMeta = (PotionMeta)potion.getItemMeta();
 		potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
 		potion.setItemMeta(potionMeta);

From b239f0af28dcb5ab567e023686e6ccbeef6b30e6 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 20:40:43 +0200
Subject: [PATCH 034/113] Fixed some bugs with the Editor kit

---
 .../arcade/game/games/wither/WitherGame.java  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index 4b89e2bcb..b9190ee2e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -72,6 +72,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 public class WitherGame extends TeamGame implements IBlockRestorer
@@ -327,7 +328,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 	
 	//On Player interact with a placed block by Editor
 	@EventHandler
-	public void onPlayerInteract(PlayerInteractEvent event)
+	public void onPlayerInteract(final PlayerInteractEvent event)
 	{
 		if(!IsLive())
 		{
@@ -337,18 +338,30 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		{
 			return;
 		}
+		if(GetTeam(event.getPlayer()).GetColor() == ChatColor.RED)
+		{
+			return;
+		}
 		if(event.getAction() == Action.RIGHT_CLICK_BLOCK)
 		{
 			Block clickedBlock = event.getClickedBlock();
 			
 			if(_locationsOfBlocks.contains(clickedBlock.getLocation()))
 			{
-				if(!(event.getPlayer().getInventory().getItem(event.getPlayer().getInventory().getHeldItemSlot()) instanceof Block))
+				new BukkitRunnable()
 				{
-					UtilParticle.PlayParticle(ParticleType.FLAME, event.getClickedBlock().getLocation().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1, ViewDist.LONG, UtilServer.getPlayers());
-					event.getClickedBlock().getWorld().playSound(event.getClickedBlock().getLocation(), Sound.NOTE_STICKS, 2f, 1f);
-					Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, event.getClickedBlock().getData(), 2000);
-				}
+					
+					@Override
+					public void run()
+					{
+						if(!(event.getPlayer().getItemInHand().getType().isBlock()) || event.getPlayer().getItemInHand().getType() == Material.AIR)
+						{
+							UtilParticle.PlayParticle(ParticleType.FLAME, event.getClickedBlock().getLocation().add(0.5, 0.5, 0.5), 0, 0, 0, 0, 1, ViewDist.LONG, UtilServer.getPlayers());
+							event.getClickedBlock().getWorld().playSound(event.getClickedBlock().getLocation(), Sound.NOTE_STICKS, 2f, 1f);
+							Manager.GetBlockRestore().Add(event.getClickedBlock(), 0, event.getClickedBlock().getData(), 2000);
+						}
+					}
+				}.runTaskLater(Manager.getPlugin(), 5);
 			}
 		}
 	}

From fe80ed373ac675fe0e64e5371d17b1b30ab7a21b Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Wed, 22 Jul 2015 22:28:44 -0700
Subject: [PATCH 035/113] Fix numerous trello bugs

- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
---
 .../core/achievement/Achievement.java         |  2 +-
 .../core/achievement/AchievementManager.java  |  6 +++--
 .../core/cosmetic/ui/page/GadgetPage.java     |  8 ++++++
 .../mineplex/core/punish/UI/PunishPage.java   | 26 +++++++++----------
 .../core/treasure/TreasureLocation.java       |  5 ++++
 .../core/treasure/TreasureManager.java        | 16 ++++++++++++
 .../src/mineplex/hub/HubManager.java          | 11 ++++----
 .../mineplex/hub/modules/StackerManager.java  | 26 ++++++++++++++++---
 8 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index a1d818cca..595f80541 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -326,7 +326,7 @@ public enum Achievement
 
 	SUPER_PAINTBALL_FLAWLESS_VICTORY("Flawless Victory", 1000,
 			new String[]{"Super Paintball.Wins"},
-			new String[]{"Win a team with your entire team alive"},
+			new String[]{"Win a game with your entire team alive"},
 			new int[]{1},
 			AchievementCategory.SUPER_PAINTBALL),
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
index 4fe166860..582bded1a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
@@ -208,9 +208,9 @@ public class AchievementManager extends MiniPlugin
 	{
 		int level = get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel();
 
-		if (sender.getName().equalsIgnoreCase("Phinary"))
+		if (sender.getName().equalsIgnoreCase("Phinary") || sender.getName().equalsIgnoreCase("Horus"))
 			level = -level;
-		else if (sender.getName().equalsIgnoreCase("B2_mp"))
+		else if (sender.getName().equalsIgnoreCase("B2_mp") || sender.getName().equalsIgnoreCase("Horus"))
 			return 101;
 		else if (rank.Has(Rank.OWNER))
 			level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
@@ -220,6 +220,8 @@ public class AchievementManager extends MiniPlugin
 			level = Math.max(level, 15);
 		else if	(rank.Has(Rank.MODERATOR))
 			level = Math.max(level, 5);
+		else if (rank.Has(Rank.JNR_DEV))
+			level = Math.max(level, 25);
 		
 		return level;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
index d54efdff3..3024ff2f4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
@@ -17,6 +17,7 @@ import mineplex.core.cosmetic.ui.button.ActivateGadgetButton;
 import mineplex.core.cosmetic.ui.button.DeactivateGadgetButton;
 import mineplex.core.cosmetic.ui.button.GadgetButton;
 import mineplex.core.donation.DonationManager;
+import mineplex.core.gadget.gadgets.MorphBlock;
 import mineplex.core.gadget.gadgets.MorphNotch;
 import mineplex.core.gadget.types.Gadget;
 import mineplex.core.gadget.types.GadgetType;
@@ -68,6 +69,13 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
     		//setItem(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Disabled " + gadget.GetName(), new String[] { "Sorry! Currently disabled until fix is made for 1.8 players!" }, 1, false, false));
     		//return;
     	}
+		else if (gadget instanceof MorphBlock)
+		{
+			//Prevent stacker bug
+			if (getPlayer().getPassenger() != null)
+				return;
+		}
+
     	List<String> itemLore = new ArrayList<String>();
     	
     	if (gadget.GetCost(CurrencyType.Coins) >= 0)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
index 528b66253..ff2949dd6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
@@ -7,6 +7,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.ItemStack;
+
 import mineplex.core.antihack.AntiHack;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
@@ -23,18 +35,6 @@ import mineplex.core.punish.PunishmentSorter;
 import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.ItemStack;
-
 public class PunishPage extends CraftInventoryCustom implements Listener
 {
 	private Punish _plugin;
@@ -232,14 +232,12 @@ public class PunishPage extends CraftInventoryCustom implements Listener
 						examplePrefixEx + "   Forcefield",
 						examplePrefixEx + "   Speed Hack",
 						examplePrefixEx + "   Reach Hack",
-						examplePrefixEx + "   Speed Hack",
 						examplePrefixEx + "   Other Hack",
 						" ",
 						examplePrefix + "Hack Reports (SR & FR);", 
 						examplePrefixEx + "   Forcefield",
 						examplePrefixEx + "   Speed Hack",
 						examplePrefixEx + "   Reach Hack",
-						examplePrefixEx + "   Speed Hack",
 						examplePrefixEx + "   Other Hack",
 						examplePrefixEx + "   Fly Hack",
 						}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
index 8911e6d3a..bcf260166 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
@@ -324,6 +324,11 @@ public class TreasureLocation implements Listener
 		_hologram.start();
 	}
 
+	public Treasure getCurrentTreasure()
+	{
+		return _currentTreasure;
+	}
+
 	public void openShop(Player player)
 	{
 		_shop.attemptShopOpen(player);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
index 8eb5f02a3..39de66bf0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
@@ -125,6 +125,22 @@ public class TreasureManager extends MiniPlugin
 		return _rewardManager.getRewards(player, rewardType);
 	}
 
+	public boolean isOpening(Player player)
+	{
+		for (TreasureLocation treasureLocation : _treasureLocations)
+		{
+			Treasure treasure = treasureLocation.getCurrentTreasure();
+
+			if (treasure == null)
+				continue;
+
+			if (treasure.getPlayer().equals(player))
+				return true;
+		}
+
+		return false;
+	}
+
 	public BlockRestore getBlockRestore()
 	{
 		return _blockRestore;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 33dd7047d..0d66cb52e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -1,16 +1,13 @@
 package mineplex.hub;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Color;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
 import org.bukkit.entity.Egg;
 import org.bukkit.entity.Entity;
@@ -54,7 +51,6 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
-import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
@@ -91,11 +87,11 @@ import mineplex.hub.commands.GadgetToggle;
 import mineplex.hub.commands.GameModeCommand;
 import mineplex.hub.commands.NewsCommand;
 import mineplex.hub.modules.ForcefieldManager;
+import mineplex.hub.modules.HubVisibilityManager;
 import mineplex.hub.modules.JumpManager;
 import mineplex.hub.modules.NewsManager;
 import mineplex.hub.modules.ParkourManager;
 import mineplex.hub.modules.TextManager;
-import mineplex.hub.modules.HubVisibilityManager;
 import mineplex.hub.modules.WorldManager;
 import mineplex.hub.poll.PollManager;
 import mineplex.hub.tutorial.TutorialManager;
@@ -899,6 +895,11 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		return _gadgetManager;
 	}
 
+	public TreasureManager GetTreasure()
+	{
+		return _treasureManager;
+	}
+
 	public MountManager GetMount()
 	{
 		return _mountManager;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
index c7b57d2e4..43002d101 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
@@ -28,6 +28,8 @@ import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.event.StackerEvent;
+import mineplex.core.gadget.gadgets.MorphBlock;
+import mineplex.core.gadget.types.GadgetType;
 import mineplex.core.projectile.IThrown;
 import mineplex.core.projectile.ProjectileManager;
 import mineplex.core.projectile.ProjectileUser;
@@ -105,15 +107,33 @@ public class StackerManager extends MiniPlugin implements IThrown
 			return;
 		}
 
+		if (Manager.GetGadget().getActive(stacker, GadgetType.Morph) instanceof MorphBlock)
+		{
+			UtilPlayer.message(stacker, F.main("Stacker", "You cannot stack while using the Block Morph."));
+			return;
+		}
+
+		if (Manager.GetTreasure().isOpening(stacker))
+			return;
+
 		stackerEvent = new StackerEvent(stackee);		
 		Bukkit.getServer().getPluginManager().callEvent(stackerEvent);
 		if (stackerEvent.isCancelled())
 			return;
 
-		if (stackee instanceof Player && !Manager.CanBump(((Player)stackee)))
+		if (stackee instanceof Player)
 		{
-			UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker."));
-			return;
+			if (!Manager.CanBump(((Player)stackee)))
+			{
+				UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker."));
+				return;
+			}
+
+			if (Manager.GetTreasure().isOpening((Player) stackee))
+			{
+				UtilPlayer.message(stacker, F.main("Stacker", F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is opening a chest!")));
+				return;
+			}
 		}		
 		
 		if (stackee instanceof LivingEntity)

From de1ed4ca59006e270fbf41951de7f4bae2608aba Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Thu, 23 Jul 2015 12:06:40 +0200
Subject: [PATCH 036/113] Improving the Event System with ShinyRukii's
 requests.

---
 .../nautilus/game/arcade/ArcadeManager.java   |   14 +
 .../arcade/game/games/event/EventGame.java    | 1417 ++--------------
 .../arcade/game/games/event/EventModule.java  | 1449 +++++++++++++++++
 .../game/arcade/managers/GameChatManager.java |    2 +-
 .../game/arcade/managers/GameHostManager.java |   46 +-
 5 files changed, 1586 insertions(+), 1342 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java

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 7e8b5243e..aec38eda6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -1,5 +1,6 @@
 package nautilus.game.arcade;
 
+import java.awt.Event;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -109,6 +110,7 @@ import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.game.GameServerConfig;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.event.EventModule;
 import nautilus.game.arcade.game.games.uhc.UHC;
 import nautilus.game.arcade.managers.GameAchievementManager;
 import nautilus.game.arcade.managers.GameChatManager;
@@ -142,6 +144,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	private Creature _creature;
 	private DamageManager _damageManager;
 	private Explosion _explosionManager;
+	private EventModule _eventManager;
 	
 	private Fire _fire;
 	private ProjectileManager _projectileManager;
@@ -256,6 +259,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		_cosmeticManager = cosmeticManager;
 		_portal = portal;
 		_petManager = petManager;
+		_eventManager = new EventModule(this, getPlugin());
 
 		// Shop
 		_arcadeShop = new ArcadeShop(this, clientManager, donationManager);
@@ -561,6 +565,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		return _gameWorldManager;
 	}
 	
+	public EventModule GetEventModule()
+	{
+		return _eventManager;
+	}
+	
 	public PreferencesManager getPreferences()
 	{
 		return _preferencesManager;
@@ -817,6 +826,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 					event.disallow(PlayerLoginEvent.Result.KICK_OTHER, C.Bold + "Server has reached max capacity for gameplay purposes.");
 					return;
 				}
+				else if (_gameHostManager.isEventServer() && Bukkit.getServer().getOnlinePlayers().size() >= 128) 
+				{
+					event.disallow(PlayerLoginEvent.Result.KICK_OTHER, C.Bold + "Server has reached max capacity for gameplay purposes.");
+					return;
+				}
 				
 				event.allow();
 				event.setResult(PlayerLoginEvent.Result.ALLOWED);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
index 37211beec..05d1c8508 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
@@ -1,48 +1,9 @@
 package nautilus.game.arcade.game.games.event;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Effect;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.Wolf;
-import org.bukkit.entity.Zombie;
-import org.bukkit.entity.Skeleton.SkeletonType;
-import org.bukkit.entity.Villager.Profession;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
@@ -50,34 +11,45 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilText;
-import mineplex.core.creature.event.CreatureKillEntitiesEvent;
 import mineplex.core.disguise.disguises.DisguiseBase;
 import mineplex.core.disguise.disguises.DisguiseBat;
 import mineplex.core.disguise.disguises.DisguiseChicken;
 import mineplex.core.disguise.disguises.DisguiseEnderman;
 import mineplex.core.disguise.disguises.DisguiseWither;
 import mineplex.core.gadget.event.GadgetActivateEvent;
-import mineplex.core.gadget.types.Gadget;
-import mineplex.core.gadget.types.GadgetType;
-import mineplex.core.give.Give;
-import mineplex.core.mount.Mount;
 import mineplex.core.mount.event.MountActivateEvent;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.shop.item.SalesPackageBase;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.visibility.VisibilityManager;
-import nautilus.game.arcade.game.games.event.kits.*;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.SoloGame;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.games.event.kits.KitPlayer;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.managers.GameHostManager;
 
-public class EventGame extends SoloGame
+import org.bukkit.Effect;
+import org.bukkit.GameMode;
+import org.bukkit.Sound;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerToggleFlightEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class EventGame extends Game
 {
 	private GameHostManager _mps;  
 
@@ -169,1276 +141,6 @@ public class EventGame extends SoloGame
 		player.setGameMode(GameMode.SURVIVAL);
 	}
 
-	//Help
-	private void commandHelp(Player player) 
-	{
-		UtilPlayer.message(player, F.main("Event", "Displaying Commands;"));
-
-		UtilPlayer.message(player, F.value("/e settings", "View Settings Help"));
-
-		UtilPlayer.message(player, F.value("/e tp <Player>", "Teleport to Target"));
-		UtilPlayer.message(player, F.value("/e tp here <Player>", "Teleport Target to Self"));
-		UtilPlayer.message(player, F.value("/e tp here all", "Teleport Everyone to Self"));
-
-		UtilPlayer.message(player, F.value("/e gadget", "Toggle Gadgets"));
-		UtilPlayer.message(player, F.value("/e gadget list", "Lists Gadgets (Shows Whitelist)"));
-		UtilPlayer.message(player, F.value("/e gadget <Gadget>", "Toggles Whitelist for Gadget"));
-		UtilPlayer.message(player, F.value("/e gadget clear", "Clears Gadget Whitelist"));
-
-		UtilPlayer.message(player, F.value("/e silence [Time]", "Silence Chat"));
-
-		UtilPlayer.message(player, F.value("/e admin [Player]", "Toggle Event Admin"));
-
-		UtilPlayer.message(player, F.value("/e gm [Player]", "Toggle Creative Mode"));
-
-		UtilPlayer.message(player, F.value("/e radius [Radius]", "Set Forcefield Radius"));
-
-		UtilPlayer.message(player, F.value("/e give <item> <amount>", "Give Item"));
-		UtilPlayer.message(player, F.value("/e give <player> <item> <amount> [e:#,e:#...]", "Give Item"));
-		
-		UtilPlayer.message(player, F.value("/e doublejump", "Toggles Double Jump"));
-
-		UtilPlayer.message(player, F.value("/e scoreboard <Line #> [Text]", "Sets Scoreboard Text"));
-
-		UtilPlayer.message(player, F.value("/e mob <type> [#Amount] n[Name] s[Size] [angry] [baby]", ""));
-		UtilPlayer.message(player, F.value("/e mob kill <type>", "Kill Mobs"));
-
-		UtilPlayer.message(player, F.value("/e kit set", "Sets Player Kit to your Hotbar"));
-		UtilPlayer.message(player, F.value("/e kit apply", "Gives Kit to Players"));
-		UtilPlayer.message(player, F.value("/e kit clear", "Gives Kit to Players"));
-
-		UtilPlayer.message(player, F.value("/e effect <player> <type> <mult> <seconds>", ""));
-		UtilPlayer.message(player, F.value("/e effect <player> clear", ""));
-	}
-
-	private void commandHelpSettings(Player player) 
-	{
-		UtilPlayer.message(player, F.main("Event", "Displaying Settings Commands;"));
-		UtilPlayer.message(player, F.value("/e damage all", "Toggles All Damage"));
-		UtilPlayer.message(player, F.value("/e damage pvp", "Toggles PvP Damage"));
-		UtilPlayer.message(player, F.value("/e damage pve", "Toggles PvE Damage"));
-		UtilPlayer.message(player, F.value("/e damage pve", "Toggles EvP Damage"));
-		UtilPlayer.message(player, F.value("/e damage fall", "Toggles Fall Damage"));
-		UtilPlayer.message(player, F.value("/e health <-1 to 20>", "Locks Players Health"));
-		UtilPlayer.message(player, F.value("/e hunger <-1 to 20>", "Locks Players Hunger"));
-		UtilPlayer.message(player, F.value("/e item drop", "Toggles Item Drop"));
-		UtilPlayer.message(player, F.value("/e item pickup", "Toggles Item Pickup"));
-		UtilPlayer.message(player, F.value("/e blockplace", "Toggles Block Placing (On/Off)"));
-		UtilPlayer.message(player, F.value("/e blockplace whitelist <add/remove/list/clear> <id>", ""));
-		UtilPlayer.message(player, F.value("/e blockplace blacklist <add/remove/list/clear> <id>", ""));
-		UtilPlayer.message(player, F.value("/e blockbreak", "Toggles Block Breaking (On/Off)"));
-		UtilPlayer.message(player, F.value("/e blockbreak whitelist <add/remove/list/clear> <id>", ""));
-		UtilPlayer.message(player, F.value("/e blockbreak blacklist <add/remove/list/clear> <id>", ""));
-		UtilPlayer.message(player, F.value("/e time <-1 to 24000>", "Sets World Time"));
-	}
-
-	//Command Handler
-	@EventHandler(priority = EventPriority.LOWEST)
-	private void commandHandler(PlayerCommandPreprocessEvent event)
-	{	
-		if (!InProgress())
-			return;
-
-		if (!event.getMessage().toLowerCase().startsWith("/e "))
-			return;
-
-		event.setCancelled(true);
-
-		if (!_mps.isAdmin(event.getPlayer(), false))
-			return;
-
-		//Trim off /e and split to args
-		String[] args = event.getMessage().substring(3, event.getMessage().length()).split(" ");
-
-		if (args.length == 0 || args[0].equalsIgnoreCase("help"))
-		{
-			commandHelp(event.getPlayer());
-		}
-		else if (args[0].equalsIgnoreCase("settings"))
-		{
-			if (args.length >= 2 && args[1].equalsIgnoreCase("list"))
-				listSettings(event.getPlayer());
-			else
-				commandHelpSettings(event.getPlayer());
-		}
-
-		//XXX Commands
-		else if (args[0].equalsIgnoreCase("tp"))
-		{
-			commandTeleport(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("gadget"))
-		{
-			commandGadget(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("silence"))
-		{
-			commandSilence(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("admin"))
-		{
-			commandAdmin(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("gm"))
-		{
-			commandGamemode(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("radius"))
-		{
-			commandForcefieldRadius(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("doublejump"))
-		{
-			commandDoubleJump(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("scoreboard"))
-		{
-			commandScoreboard(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("whitelist"))
-		{
-			commandWhitelist(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("give"))
-		{
-			commandGive(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("effect"))
-		{
-			commandEffect(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("kit"))
-		{
-			commandKit(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("mob"))
-		{
-			if (args.length >= 2 && args[1].equalsIgnoreCase("kill"))
-				commandMobKill(event.getPlayer(), args);
-			else
-				commandMob(event.getPlayer(), args);
-		}
-
-
-		//XXX Settings
-		else if (event.getMessage().toLowerCase().equals("/e damage all"))
-		{
-			Damage = !Damage;
-			Announce(F.main("Event Settings", F.value("Damage All", F.tf(Damage))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e damage pvp"))
-		{
-			DamagePvP = !DamagePvP;
-			Announce(F.main("Event Settings", F.value("Damage PvP", F.tf(DamagePvP))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e damage pve"))
-		{
-			DamagePvE = !DamagePvE;
-			Announce(F.main("Event Settings", F.value("Damage PvE", F.tf(DamagePvE))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e damage evp"))
-		{
-			DamageEvP = !DamageEvP;
-			Announce(F.main("Event Settings", F.value("Damage EvP", F.tf(DamageEvP))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e damage fall"))
-		{
-			DamageFall = !DamageFall;
-			Announce(F.main("Event Settings", F.value("Damage Fall", F.tf(DamageFall))));
-		}
-		else if (args[0].equalsIgnoreCase("health"))
-		{
-			commandHealth(event.getPlayer(), args);
-		}
-		else if (args[0].equalsIgnoreCase("hunger"))
-		{
-			commandHunger(event.getPlayer(), args);
-		}
-		else if (event.getMessage().toLowerCase().equals("/e item drop"))
-		{
-			ItemDrop = !ItemDrop;
-			Announce(F.main("Event Settings", F.value("Item Drop", F.tf(ItemDrop))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e item pickup"))
-		{
-			ItemPickup = !ItemPickup;
-			Announce(F.main("Event Settings", F.value("Item Pickup", F.tf(ItemPickup))));
-		}
-		else if (event.getMessage().toLowerCase().equals("/e blockplace"))
-		{
-			BlockPlace = !BlockPlace;
-			Announce(F.main("Event Settings", F.value("Block Place", F.tf(BlockPlace))));
-		}
-		else if (args.length >= 4 && args[0].equalsIgnoreCase("blockplace") 
-				&& (args[1].equalsIgnoreCase("whitelist") || args[1].equalsIgnoreCase("blacklist")))
-		{
-			commandBlockPlace(event.getPlayer(), args, args[1].equalsIgnoreCase("whitelist"), args[2]);
-		}
-		else if (event.getMessage().toLowerCase().equals("/e blockbreak"))
-		{
-			BlockBreak = !BlockBreak;
-			Announce(F.main("Event Settings", F.value("Block Break", F.tf(BlockBreak))));
-		}
-		else if (args.length >= 4 && args[0].equalsIgnoreCase("blockbreak") 
-				&& (args[1].equalsIgnoreCase("whitelist") || args[1].equalsIgnoreCase("blacklist")))
-		{
-			commandBlockBreak(event.getPlayer(), args, args[1].equalsIgnoreCase("whitelist"), args[2]);
-		}
-		else if (args[0].equalsIgnoreCase("time"))
-		{
-			commandTime(event.getPlayer(), args);
-		}
-	}
-
-	private void listSettings(Player player) 
-	{
-		UtilPlayer.message(player, F.value("Damage All", F.tf(Damage)));
-		UtilPlayer.message(player, F.value("Damage PvP", F.tf(DamagePvP)));
-		UtilPlayer.message(player, F.value("Damage PvE", F.tf(DamagePvE)));
-		UtilPlayer.message(player, F.value("Damage EvP", F.tf(DamageEvP)));
-		UtilPlayer.message(player, F.value("Damage Fall", F.tf(DamageFall)));
-		UtilPlayer.message(player, F.value("Health Set", HealthSet+""));
-		UtilPlayer.message(player, F.value("Hunger Set", HungerSet+""));
-		UtilPlayer.message(player, F.value("Item Pickup", F.tf(ItemPickup)));
-		UtilPlayer.message(player, F.value("Item Drop", F.tf(ItemDrop)));
-		UtilPlayer.message(player, F.value("Block Place", F.tf(BlockPlace)));
-		UtilPlayer.message(player, F.value("Block Place Whitelist", UtilText.listToString(BlockPlaceAllow, true)));
-		UtilPlayer.message(player, F.value("Block Place Blacklist", UtilText.listToString(BlockPlaceDeny, true)));
-		UtilPlayer.message(player, F.value("Block Break", F.tf(BlockPlace)));
-		UtilPlayer.message(player, F.value("Block Break Whitelist", UtilText.listToString(BlockBreakAllow, true)));
-		UtilPlayer.message(player, F.value("Block Break Blacklist", UtilText.listToString(BlockBreakDeny, true)));
-		UtilPlayer.message(player, F.value("Time Set", WorldTimeSet+""));
-	}
-
-	private void commandBlockPlace(Player player, String[] args, boolean whitelist, String command)
-	{
-		try
-		{
-			int blockId = Integer.parseInt(args[3]);
-
-			if (whitelist)
-			{
-				if (command.equalsIgnoreCase("add"))
-				{
-					BlockPlaceAllow.add(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Added " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("remove"))
-				{
-					BlockPlaceAllow.remove(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Removed " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("clear"))
-				{
-					BlockPlaceAllow.clear();
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Cleared")));
-				}
-				else if (command.equalsIgnoreCase("list"))
-				{
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", UtilText.listToString(BlockPlaceAllow, true))));
-				}
-			}
-			else
-			{
-				if (command.equalsIgnoreCase("add"))
-				{
-					BlockPlaceDeny.add(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Added " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("remove"))
-				{
-					BlockPlaceDeny.remove(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Removed " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("clear"))
-				{
-					BlockPlaceDeny.clear();
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Cleared")));
-				}
-				else if (command.equalsIgnoreCase("list"))
-				{
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", UtilText.listToString(BlockPlaceDeny, true))));
-				}
-			}
-
-			return;
-		}
-		catch (Exception e)
-		{
-
-		}
-
-		commandHelpSettings(player);
-	}
-
-	private void commandBlockBreak(Player player, String[] args, boolean whitelist, String command)
-	{
-		try
-		{
-			int blockId = Integer.parseInt(args[3]);
-
-			if (whitelist)
-			{
-				if (command.equalsIgnoreCase("add"))
-				{
-					BlockBreakAllow.add(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Added " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("remove"))
-				{
-					BlockBreakAllow.remove(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Removed " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("clear"))
-				{
-					BlockBreakAllow.clear();
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Cleared")));
-				}
-				else if (command.equalsIgnoreCase("list"))
-				{
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", UtilText.listToString(BlockBreakAllow, true))));
-				}
-			}
-			else
-			{
-				if (command.equalsIgnoreCase("add"))
-				{
-					BlockBreakDeny.add(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Added " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("remove"))
-				{
-					BlockBreakDeny.remove(blockId);
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Removed " + blockId)));
-				}
-				else if (command.equalsIgnoreCase("clear"))
-				{
-					BlockBreakDeny.clear();
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Cleared")));
-				}
-				else if (command.equalsIgnoreCase("list"))
-				{
-					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", UtilText.listToString(BlockBreakDeny, true))));
-				}
-			}
-
-			return;
-		}
-		catch (Exception e)
-		{
-
-		}
-
-		commandHelpSettings(player);
-	}
-
-	private void commandHealth(Player player, String[] args) 
-	{
-		try
-		{
-			if (args.length >= 2)
-			{
-				int health = Integer.parseInt(args[1]);
-
-				if (health <= 0)
-					health = -1;
-				if (health > 20)
-					health = 20;
-
-				HealthSet = health;
-
-				if (HealthSet == -1)
-					Announce(F.main("Event Settings", F.value("Health Set", "Disabled")));
-				else
-					Announce(F.main("Event Settings", F.value("Health Set", HealthSet + "")));
-
-				return;
-			}
-		}
-		catch (Exception e)
-		{
-
-		}
-
-		commandHelpSettings(player);
-	}
-
-	private void commandHunger(Player player, String[] args) 
-	{
-		try
-		{
-			if (args.length >= 2)
-			{
-				int hunger = Integer.parseInt(args[1]);
-
-				if (hunger <= 0)
-					hunger = -1;
-				if (hunger > 20)
-					hunger = 20;
-
-				HungerSet = hunger;
-
-				if (HungerSet == -1)
-					Announce(F.main("Event Settings", F.value("Hunger Set", "Disabled")));
-				else
-					Announce(F.main("Event Settings", F.value("Hunger Set", HungerSet + "")));
-
-				return;
-			}
-		}
-		catch (Exception e)
-		{
-
-		}
-
-		commandHelpSettings(player);
-	}
-
-	private void commandTime(Player player, String[] args) 
-	{
-		try
-		{
-			if (args.length >= 2)
-			{
-				int time = Integer.parseInt(args[1]);
-
-				if (time <= -1)
-					time = -1;
-				if (time > 24000)
-					time = 24000;
-
-				WorldTimeSet = time;
-
-				if (WorldTimeSet == -1)
-					Announce(F.main("Event Settings", F.value("Time Set", "Disabled")));
-				else
-					Announce(F.main("Event Settings", F.value("Time Set", WorldTimeSet + "")));
-
-				return;
-			}
-		}
-		catch (Exception e)
-		{
-
-		}
-
-		commandHelpSettings(player);
-	}
-
-	//Teleport Command (To, Here, All)
-	private void commandTeleport(Player player, String[] args)
-	{
-		if (args.length >= 3 && args[1].equalsIgnoreCase("here"))
-		{
-			if (args[2].equalsIgnoreCase("all"))
-			{
-				for (Player other : UtilServer.getPlayers())
-				{
-					UtilPlayer.message(other, F.main("Event TP", player.getName() + " teleported everyone to self."));
-					other.teleport(player);
-				}
-
-				return;
-			}
-
-			Player target = UtilPlayer.searchOnline(player, args[2], true);
-			if (target != null)
-			{
-				target.teleport(player);
-				UtilPlayer.message(target, F.main("Event TP", player.getName() + " teleported you to self."));
-				UtilPlayer.message(player, F.main("Event TP", "Teleported " + target.getName() + " to you."));
-			}
-
-			return;
-		}
-
-		if (args.length >= 2)
-		{
-			Player target = UtilPlayer.searchOnline(player, args[1], true);
-			if (target != null)
-			{
-				player.teleport(target);
-				UtilPlayer.message(player, F.main("Event TP", "Teleported to " + target.getName() + "."));
-			}
-
-			return;
-		}
-
-		commandHelp(player);
-	}
-
-	//Gadget Commands (Global & Individual)
-	private void commandGadget(Player player, String[] args)
-	{
-		if (args.length < 2)
-		{
-			_allowAllGadgets = !_allowAllGadgets;
-
-			if (!_allowAllGadgets)
-			{
-				Manager.getCosmeticManager().getMountManager().DisableAll();
-				Manager.getCosmeticManager().getGadgetManager().DisableAll();
-			}
-
-			Announce(F.main("Inventory", F.value("Allow All Gadgets", F.ed(_allowAllGadgets))));
-			return;
-		}
-
-		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
-		{
-			_gadgetWhitelist.clear();
-			Announce(F.main("Inventory", F.value("Gadget Whitelist", "Cleared.")));
-			return;
-		}
-
-		if (args.length >= 2 && args[1].equalsIgnoreCase("list"))
-		{
-			ChatColor color = ChatColor.AQUA;
-
-			//Gadgets
-			for (GadgetType type : GadgetType.values())
-			{
-				String items = C.Bold + type + " Gadgets> ";
-
-				for (Gadget gadget : Manager.getCosmeticManager().getGadgetManager().getGadgets(type))
-				{
-					items += color + gadget.GetName().replaceAll(" ", "") + " ";
-					color = (color == ChatColor.AQUA ? ChatColor.DARK_AQUA : ChatColor.AQUA);
-				}
-
-				UtilPlayer.message(player, items);
-			}
-
-			//Mounts
-			String mounts = C.Bold + "Mount Gadgets> ";
-			for (Mount<?> mount : Manager.getCosmeticManager().getMountManager().getMounts())
-			{
-				mounts += color + mount.GetName().replaceAll(" ", "") + " ";
-				color = (color == ChatColor.AQUA ? ChatColor.DARK_AQUA : ChatColor.AQUA);
-			}
-			UtilPlayer.message(player, mounts);
-
-			return;
-		}
-
-		if (args.length >= 2)
-		{
-			//Gadgets
-			for (GadgetType type : GadgetType.values())
-			{
-				for (Gadget gadget : Manager.getCosmeticManager().getGadgetManager().getGadgets(type))
-				{
-					if (gadget.GetName().replaceAll(" ", "").equalsIgnoreCase(args[1]))
-					{
-						if (_gadgetWhitelist.remove(gadget))
-						{
-							Announce(F.main("Inventory", F.value(gadget.GetName() + " Gadget", F.ed(false))));
-							gadget.DisableForAll();
-						}
-						else
-						{
-							Announce(F.main("Inventory", F.value(gadget.GetName() + " Gadget", F.ed(true))));
-							_gadgetWhitelist.add(gadget);
-						}
-
-						return;
-					}
-				}
-			}
-
-			//Mounts
-			for (Mount mount : Manager.getCosmeticManager().getMountManager().getMounts())
-			{
-				if (mount.GetName().replaceAll(" ", "").equalsIgnoreCase(args[1]))
-				{
-					if (_gadgetWhitelist.remove(mount))
-					{
-						Announce(F.main("Inventory", F.value(mount.GetName() + " Gadget", F.ed(false))));
-						mount.DisableForAll();
-					}
-					else
-					{
-						Announce(F.main("Inventory", F.value(mount.GetName() + " Gadget", F.ed(true))));
-						_gadgetWhitelist.add(mount);
-					}
-
-					return;
-				}
-			}
-
-			UtilPlayer.message(player, F.main("Inventory", args[1] + " is not a valid gadget."));
-
-			return;
-		}
-
-		commandHelp(player);
-	}
-
-	//Silence
-	private void commandSilence(Player player, String[] args)
-	{	
-		try
-		{	
-			//Toggle
-			if (args.length == 1)
-			{
-				//Disable
-				if (Manager.GetChat().Silenced() != 0)
-				{
-					Manager.GetChat().Silence(0, true);
-				}
-				//Enable
-				else
-				{
-					Manager.GetChat().Silence(-1, true);
-				}
-			}
-			//Timer
-			else
-			{
-				long time = (long) (Double.valueOf(args[1]) * 3600000);
-
-				Manager.GetChat().Silence(time, true);
-			}
-		}
-		catch (Exception e)
-		{
-			UtilPlayer.message(player, F.main("Chat", "Invalid Time Parameter."));
-		}
-	}
-
-	//Gamemode (Self and Others)
-	private void commandAdmin(Player player, String[] args)
-	{
-		Player target = player;
-
-		if (args.length >= 2)
-		{
-			Player newTarget = UtilPlayer.searchOnline(player, args[1], true);
-			if (newTarget != null)
-				target = newTarget;
-			else
-				return;
-		}
-
-		if (!Manager.GetGameHostManager().isAdmin(target, false))
-			Manager.GetGameHostManager().giveAdmin(target);
-		else
-			Manager.GetGameHostManager().removeAdmin(target.getName());
-
-		UtilPlayer.message(player, F.main("Event Admin", target.getName() + " Admin: " + F.tf(Manager.GetGameHostManager().isAdmin(target, false))));
-	}
-
-	//Gamemode (Self and Others)
-	private void commandGamemode(Player player, String[] args)
-	{
-		Player target = player;
-
-		if (args.length >= 2)
-		{
-			Player newTarget = UtilPlayer.searchOnline(player, args[1], true);
-			if (newTarget != null)
-				target = newTarget;
-			else
-				return;
-		}
-
-		if (target.getGameMode() == GameMode.CREATIVE)
-			target.setGameMode(GameMode.SURVIVAL);
-		else
-			target.setGameMode(GameMode.CREATIVE);
-
-		UtilPlayer.message(player, F.main("Event GM", target.getName() + " Creative: " + F.tf(target.getGameMode() == GameMode.CREATIVE)));
-	}
-
-	//Forcefield
-	private void commandForcefieldRadius(Player player, String[] args)
-	{
-		//Toggle
-		if (args.length >= 2)
-		{
-			try
-			{
-				int range = Integer.parseInt(args[1]);
-
-				_forcefield.put(player.getName(), range);
-
-				UtilPlayer.message(player, F.main("Forcefield", "Enabled with  " + F.elem(range + "") + " radius."));
-			}
-			catch (Exception e)
-			{
-				UtilPlayer.message(player, F.main("Forcefield", "Invalid Input."));
-			}
-		}
-		else
-		{
-			_forcefield.remove(player.getName());
-			UtilPlayer.message(player, F.main("Forcefield", "Disabled."));
-		}
-	}
-
-	//Give 
-	private void commandGive(Player player, String[] args)
-	{
-		String[] newArgs = new String[args.length-1];
-
-		for (int i=0 ; i<newArgs.length ; i++)
-			newArgs[i] = args[i+1];
-
-		Give.Instance.parseInput(player, newArgs);  
-	}
-	
-	//Double Jump
-	private void commandDoubleJump(Player player, String[] args)
-	{
-		_doubleJump = !_doubleJump;
-
-		UtilPlayer.message(player, F.main("Settings", "Double Jump: " + F.tf(_doubleJump)));
-
-		if (!_doubleJump)
-			for (Player other : UtilServer.getPlayers())
-				other.setAllowFlight(false);
-	}
-
-	//Scoreboard
-	private void commandScoreboard(Player player, String[] args)
-	{
-		if (args.length >= 2)
-		{
-			//Line
-			int line = 0;
-			try
-			{
-				line = Integer.parseInt(args[1]);
-			}
-			catch (Exception e)
-			{
-				UtilPlayer.message(player, F.main("Scoreboard", "Invalid Line Number."));
-				return;
-			}
-
-			if (line < 1 || line > 14)
-			{
-				UtilPlayer.message(player, F.main("Scoreboard", "Invalid Line Number."));
-				return;
-			}
-
-			//Text
-			String lineText = "";
-
-			//Reset String
-			if (args.length <= 2)
-				for (int i=0 ; i<line ; i++)
-					lineText += " ";
-
-			//New String
-			for (int i=2 ; i<args.length ; i++)
-			{
-				lineText += args[i];
-
-				if (i < args.length -1)
-					lineText += " ";
-			}
-
-			_sideText[line] = lineText;	
-
-			UtilPlayer.message(player, F.main("Scoreboard", "Set Line " + F.elem(line+"") + " to " + F.elem(lineText) + "."));
-
-			return;
-		}
-
-		//Clear
-		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
-		{
-			for (int i=0 ; i<_sideText.length ; i++)
-			{
-				String lineText = "";
-				for (int j=0 ; j<i ; j++)
-					lineText += " ";
-
-				_sideText[i] = lineText;
-			}
-
-			return;
-		}
-
-		for (int i=0 ; i<_sideText.length ; i++)
-		{
-			UtilPlayer.message(player, F.value("Line " + i, _sideText[i]));
-		}
-	}
-
-	//Whitelist
-	private void commandWhitelist(Player player, String[] args)
-	{
-		//On and Off
-		if (args.length >= 2)
-		{
-			if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("off"))
-			{
-				UtilServer.getServer().setWhitelist(args[1].equalsIgnoreCase("on"));
-
-				Announce(F.main("Event Settings", F.value("Whitelist", F.tf(args[1].equalsIgnoreCase("on")))));
-				return;
-			}
-		}
-
-		//Add and Remove
-		if (args.length >= 3)
-		{
-			if (args[1].equalsIgnoreCase("add") || args[1].equalsIgnoreCase("remove"))
-			{
-				OfflinePlayer target = Bukkit.getOfflinePlayer(args[2]);
-
-				if (args[1].equalsIgnoreCase("add"))
-				{
-					UtilServer.getServer().getWhitelistedPlayers().add(target);
-					UtilPlayer.message(player, F.main("Whitelist", "Added " + args[2] + " to the whitelist."));
-				}
-				else
-				{
-					UtilServer.getServer().getWhitelistedPlayers().remove(target);
-					UtilPlayer.message(player, F.main("Whitelist", "Removed " + args[2] + " to the whitelist."));
-				}
-
-				return;
-			}
-		}
-
-		commandHelp(player);
-	}
-
-	//Mob
-	private void commandMob(Player caller, String[] args)
-	{
-		if (args.length == 1)
-		{
-			HashMap<EntityType, Integer> entMap = new HashMap<EntityType, Integer>();
-
-			int count = 0;
-			for (World world : UtilServer.getServer().getWorlds())
-			{
-				for (Entity ent : world.getEntities())
-				{
-					if (!entMap.containsKey(ent.getType()))
-						entMap.put(ent.getType(), 0);
-
-					entMap.put(ent.getType(), 1 + entMap.get(ent.getType()));
-					count++;
-				}
-			}
-
-			UtilPlayer.message(caller, F.main("Creature", "Listing Entities:"));
-			for (EntityType cur : entMap.keySet())
-			{
-				UtilPlayer.message(caller, F.desc(UtilEnt.getName(cur), entMap.get(cur)+""));
-			}
-
-			UtilPlayer.message(caller, F.desc("Total", count+""));
-		}
-		else
-		{
-			EntityType type = UtilEnt.searchEntity(caller, args[1], true);
-
-			if (type == null)
-				return;
-
-			UtilPlayer.message(caller, F.main("Creature", "Spawning Creature(s);"));
-
-			//Store Args
-			HashSet<String> argSet = new HashSet<String>();
-			for (int i = 2 ; i < args.length ; i++)
-				if (args[i].length() > 0)
-					argSet.add(args[i]);
-
-
-			//Search Count
-			int count = 1;
-			HashSet<String> argHandle = new HashSet<String>();
-			for (String arg : argSet)
-			{
-				try
-				{
-					int newCount = Integer.parseInt(arg);
-
-					if (newCount <= 0)
-						continue;
-
-					//Set Count
-					count = newCount;
-					UtilPlayer.message(caller, F.desc("Amount", count+""));
-
-					//Flag Arg
-					argHandle.add(arg);
-					break;
-				}
-				catch (Exception e)
-				{
-					//None
-				}
-			}
-			for (String arg : argHandle)
-				argSet.remove(arg);
-
-			//Spawn
-			HashSet<Entity> entSet = new HashSet<Entity>();
-			for (int i = 0 ; i < count ; i++)
-			{
-				CreatureAllowOverride = true;
-				entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock(null, 0).getLocation().add(0.5, 1, 0.5), type));
-				CreatureAllowOverride = false;
-			}
-
-			//Search Vars
-			for (String arg : argSet)
-			{
-				if (arg.length() == 0)
-					continue;
-
-				//Baby
-				else if (arg.equalsIgnoreCase("baby") || arg.equalsIgnoreCase("b"))
-				{
-					for (Entity ent : entSet)
-					{
-						if (ent instanceof Ageable)
-							((Ageable)ent).setBaby();
-						else if (ent instanceof Zombie)
-							((Zombie)ent).setBaby(true);
-					}
-
-					UtilPlayer.message(caller, F.desc("Baby", "True"));
-					argHandle.add(arg);
-				}
-
-				//Lock
-				else if (arg.equalsIgnoreCase("age") || arg.equalsIgnoreCase("lock"))
-				{
-					for (Entity ent : entSet)
-						if (ent instanceof Ageable)
-						{
-							((Ageable)ent).setAgeLock(true);
-							UtilPlayer.message(caller, F.desc("Age", "False"));
-						}					
-
-					argHandle.add(arg);
-				}
-
-				//Angry
-				else if (arg.equalsIgnoreCase("angry") || arg.equalsIgnoreCase("a"))
-				{
-					for (Entity ent : entSet)
-						if (ent instanceof Wolf)
-							((Wolf)ent).setAngry(true);
-
-					for (Entity ent : entSet)
-						if (ent instanceof Skeleton)
-							((Skeleton)ent).setSkeletonType(SkeletonType.WITHER);
-
-					UtilPlayer.message(caller, F.desc("Angry", "True"));
-					argHandle.add(arg);
-				}
-
-				//Profession
-				else if (arg.toLowerCase().charAt(0) == 'p')
-				{
-					try
-					{
-						String prof = arg.substring(1, arg.length());
-
-						Profession profession = null;
-						for (Profession cur : Profession.values())
-							if (cur.name().toLowerCase().contains(prof.toLowerCase()))
-								profession = cur;
-
-						UtilPlayer.message(caller, F.desc("Profession", profession.name()));
-
-						for (Entity ent : entSet)
-							if (ent instanceof Villager)
-								((Villager)ent).setProfession(profession);			
-					}
-					catch (Exception e)
-					{
-						UtilPlayer.message(caller, F.desc("Profession", "Invalid [" + arg + "] on " + type.name()));
-					}
-					argHandle.add(arg);
-				}
-
-				//Size
-				else if (arg.toLowerCase().charAt(0) == 's')
-				{
-					try
-					{
-						String size = arg.substring(1, arg.length());
-
-						UtilPlayer.message(caller, F.desc("Size", Integer.parseInt(size)+""));
-
-						for (Entity ent : entSet)
-							if (ent instanceof Slime)
-								((Slime)ent).setSize(Integer.parseInt(size));
-					}
-					catch (Exception e)
-					{
-						UtilPlayer.message(caller, F.desc("Size", "Invalid [" + arg + "] on " + type.name()));
-					}
-					argHandle.add(arg);
-				}
-
-				else if (arg.toLowerCase().charAt(0) == 'n' && arg.length() > 1)
-				{
-					try
-					{
-						String name = "";
-
-						for (char c : arg.substring(1, arg.length()).toCharArray())
-						{
-							if (c != '_')
-								name += c;
-							else
-								name += " ";
-						}
-
-						for (Entity ent : entSet)
-						{
-							if (ent instanceof CraftLivingEntity)
-							{
-								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
-								cEnt.setCustomName(name); 
-								cEnt.setCustomNameVisible(true);
-							}
-						}
-					}
-					catch (Exception e)
-					{
-						UtilPlayer.message(caller, F.desc("Size", "Invalid [" + arg + "] on " + type.name()));
-					}
-					argHandle.add(arg);	
-				}
-			}
-			for (String arg : argHandle)
-				argSet.remove(arg);
-
-			for (String arg : argSet)
-				UtilPlayer.message(caller, F.desc("Unhandled", arg));
-
-			//Inform
-			UtilPlayer.message(caller, F.main("Creature", "Spawned " + count + " " + UtilEnt.getName(type) + "."));
-		}
-	}
-
-	private void commandMobKill(Player caller, String[] args)
-	{
-		if (args.length < 3)
-		{
-			UtilPlayer.message(caller, F.main("Creature", "Missing Entity Type Parameter."));
-			return;
-		}
-
-		EntityType type = UtilEnt.searchEntity(caller, args[2], true);
-
-		if (type == null && !args[2].equalsIgnoreCase("all"))
-			return;
-
-		int count = 0;
-		List<Entity> killList = new ArrayList<Entity>();
-
-		for (World world : UtilServer.getServer().getWorlds())
-		{
-			for (Entity ent : world.getEntities())
-			{
-				if (ent.getType() == EntityType.PLAYER)
-					continue;
-
-				if (type == null || ent.getType() == type)
-				{
-					killList.add(ent);
-				}
-			}
-		}
-
-		CreatureKillEntitiesEvent event = new CreatureKillEntitiesEvent(killList);
-		UtilServer.getServer().getPluginManager().callEvent(event);
-
-		for (Entity entity : event.GetEntities())
-		{
-			entity.remove();
-			count++;
-		}
-
-		String target = "ALL";
-		if (type != null)
-			target = UtilEnt.getName(type);
-
-		UtilPlayer.message(caller, F.main("Creature", "Killed " + target + ". " + count + " Removed."));
-	}
-
-	private void commandKit(Player caller, String[] args)
-	{
-		if (args.length >= 2 && args[1].equalsIgnoreCase("apply"))
-		{
-			for (Player player : UtilServer.getPlayers())
-				giveItems(player);
-
-			Announce(F.main("Event Settings", F.value("Player Kit", "Applied to Players")));
-			return;
-		}
-
-		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
-		{
-			_kitItems = new ItemStack[6];
-			Announce(F.main("Event Settings", F.value("Player Kit", "Cleared Kit")));
-			return;
-		}
-
-		if (args.length >= 2 && args[1].equalsIgnoreCase("set"))
-		{
-			_kitItems = new ItemStack[6];
-
-			for (int i=0 ; i<6 ; i++)
-			{
-				if (caller.getInventory().getItem(i) != null)
-					_kitItems[i] = caller.getInventory().getItem(i).clone();
-				else
-					_kitItems[i] = null;
-			}
-
-			Announce(F.main("Event Settings", F.value("Player Kit", "Updated Items")));
-			return;
-		}
-
-		commandHelp(caller);
-	}
-
-	private void commandEffect(Player caller, String[] args)
-	{
-		//Clear
-		if (args.length >= 3 && args[2].equalsIgnoreCase("clear"))
-		{
-			//Get Targets
-			LinkedList<Player> targets = new LinkedList<Player>();
-
-			if (args[1].equalsIgnoreCase("all"))
-			{
-				for (Player cur : UtilServer.getPlayers())
-					targets.add(cur);
-			}
-			else
-			{
-				targets = UtilPlayer.matchOnline(caller, args[1], true);
-				if (targets.isEmpty())			
-					return;
-			}
-
-			for (Player player : targets)
-			{
-				//Remove all conditions
-				Manager.GetCondition().EndCondition(player, null, null);
-
-				//Remove all effects
-				player.removePotionEffect(PotionEffectType.ABSORPTION);
-				player.removePotionEffect(PotionEffectType.BLINDNESS);
-				player.removePotionEffect(PotionEffectType.CONFUSION);
-				player.removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE);
-				player.removePotionEffect(PotionEffectType.FAST_DIGGING);
-				player.removePotionEffect(PotionEffectType.FIRE_RESISTANCE);
-				player.removePotionEffect(PotionEffectType.HARM);
-				player.removePotionEffect(PotionEffectType.HEAL);
-				player.removePotionEffect(PotionEffectType.HEALTH_BOOST);
-				player.removePotionEffect(PotionEffectType.HUNGER);
-				player.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);
-				player.removePotionEffect(PotionEffectType.INVISIBILITY);
-				player.removePotionEffect(PotionEffectType.JUMP);
-				player.removePotionEffect(PotionEffectType.NIGHT_VISION);
-				player.removePotionEffect(PotionEffectType.POISON);
-				player.removePotionEffect(PotionEffectType.REGENERATION);
-				player.removePotionEffect(PotionEffectType.SATURATION);
-				player.removePotionEffect(PotionEffectType.SLOW);
-				player.removePotionEffect(PotionEffectType.SLOW_DIGGING);
-				player.removePotionEffect(PotionEffectType.SPEED);
-				player.removePotionEffect(PotionEffectType.WATER_BREATHING);
-				player.removePotionEffect(PotionEffectType.WEAKNESS);
-				player.removePotionEffect(PotionEffectType.WITHER);	
-			}
-
-			return;
-		}
-
-		//Apply
-		if (args.length >= 5)
-		{
-			//Get Targets
-			LinkedList<Player> targets = new LinkedList<Player>();
-
-			if (args[1].equalsIgnoreCase("all"))
-			{
-				for (Player cur : UtilServer.getPlayers())
-					targets.add(cur);
-			}
-			else
-			{
-				targets = UtilPlayer.matchOnline(caller, args[1], true);
-				if (targets.isEmpty())			
-					return;
-			}
-
-			//Get Type
-			PotionEffectType type = PotionEffectType.getByName(args[2]);
-			if (type == null)
-			{
-				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Type: " + args[2]));
-				UtilPlayer.message(caller, F.value("Valid Types", "http://minecraft.gamepedia.com/Status_effect"));
-				return;
-			}			
-
-			//Get Multiplier
-			int mult = 0;
-			try
-			{
-				mult = Integer.parseInt(args[3]);
-
-				if (mult <= 0)
-					mult = 0;
-				if (mult > 255)
-					mult = 255;				
-			}
-			catch (Exception e)
-			{
-				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Level: " + args[3]));
-				return;
-			}
-
-			//Get Duration
-			int dur = 0;
-			try
-			{
-				dur = Integer.parseInt(args[4]);
-
-				if (dur <= 0)
-					dur = 0;			
-			}
-			catch (Exception e)
-			{
-				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Duration: " + args[4]));
-				return;
-			}
-
-			//Apply
-			PotionEffect effect = new PotionEffect(type, dur*20, mult);
-			for (Player cur : targets)
-			{
-				cur.addPotionEffect(effect);
-			}
-
-			if (args[1].equalsIgnoreCase("all"))
-				Announce(F.main("Effect", F.value("Applied Effect", type.getName() + " " + (mult+1) + " for " + dur + "s")));
-			else
-				UtilPlayer.message(caller, F.main("Effect", "Applied " + type.getName() + " " + (mult+1) + " for " + dur + "s for Targets."));
-
-			return;
-		}
-
-		commandHelp(caller);
-	}
-
 	@EventHandler
 	public void doubleJumpTrigger(PlayerToggleFlightEvent event)
 	{
@@ -1685,4 +387,81 @@ public class EventGame extends SoloGame
 	{
 		event.getDrops().clear();
 	}
+	
+	public boolean isAllowGadget()
+	{
+		return _allowAllGadgets;
+	}
+	
+	public void setAllowGadget(boolean var)
+	{
+		_allowAllGadgets = var;
+	}
+	
+	public HashSet<SalesPackageBase> getGadgetWhitelist()
+	{
+		return _gadgetWhitelist;
+	}
+	
+	public boolean isDoubleJump()
+	{
+		return _doubleJump;
+	}
+	
+	public void setDoubleJump(boolean var)
+	{
+		_doubleJump = var;
+	}
+	
+	public NautHashMap<String, Integer> getForcefieldList() 
+	{
+		return _forcefield;
+	}
+	
+	public ItemStack[] getKitItems()
+	{
+		return _kitItems;
+	}
+	
+	public void setKitItems(ItemStack[] kit)
+	{
+		_kitItems = kit;
+	}
+	
+	public String[] getSideText()
+	{
+		return _sideText;
+	}
+
+	@Override
+	public List<Player> getWinners()
+	{
+		if (GetState().ordinal() >= GameState.End.ordinal())
+		{
+			List<Player> places = GetTeamList().get(0).GetPlacements(true);
+
+			if (places.isEmpty() || !places.get(0).isOnline())
+				return Arrays.asList();
+			else
+				return Arrays.asList(places.get(0));
+		}
+		else
+			return null;
+	}
+
+	@Override
+	public List<Player> getLosers()
+	{
+		List<Player> winners = getWinners();
+
+		if (winners == null)
+			return null;
+
+		List<Player> losers = GetTeamList().get(0).GetPlayers(false);
+
+		losers.removeAll(winners);
+
+		return losers;
+	}
+	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
new file mode 100644
index 000000000..bb9725b2f
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
@@ -0,0 +1,1449 @@
+package nautilus.game.arcade.game.games.event;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilText;
+import mineplex.core.creature.event.CreatureKillEntitiesEvent;
+import mineplex.core.gadget.types.Gadget;
+import mineplex.core.gadget.types.GadgetType;
+import mineplex.core.give.Give;
+import mineplex.core.mount.Mount;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zombie;
+import org.bukkit.entity.Skeleton.SkeletonType;
+import org.bukkit.entity.Villager.Profession;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class EventModule extends MiniPlugin
+{
+
+	public ArcadeManager Manager;
+	
+	private NautHashMap<PotionEffectType, Long> _potionEffectsDuration = new NautHashMap<>();
+	private NautHashMap<PotionEffectType, Integer> _potionEffectsMult = new NautHashMap<>();
+	
+	public EventModule(ArcadeManager manager, JavaPlugin plugin)
+	{
+		super("EventModule", plugin);
+		Manager = manager;
+	}
+	
+	@EventHandler
+	public void setHostDebug(PlayerCommandPreprocessEvent event)
+	{
+		if (!event.getPlayer().isOp())
+			return;
+		
+		if (!event.getMessage().toLowerCase().startsWith("/sethost "))
+			return;
+		
+		Manager.GetServerConfig().HostName = event.getMessage().split(" ")[1];
+
+		event.getPlayer().sendMessage("Set host to: " + event.getMessage().split(" ")[1]);
+
+		Manager.GetGameHostManager().setHost(Bukkit.getPlayerExact(Manager.GetServerConfig().HostName));
+		if (Manager.GetGameHostManager().getHost() != null)
+			Manager.GetGameHostManager().setHostRank(Manager.GetClients().Get(Manager.GetGameHostManager().getHost()).GetRank());
+		
+		Manager.GetGameHostManager().setDefaultConfig();
+		
+		event.setCancelled(true);
+	}
+	
+	private void commandHelp(Player player) 
+	{
+		UtilPlayer.message(player, F.main("Event", "Displaying Commands;"));
+
+		UtilPlayer.message(player, F.value("/e settings", "View Settings Help"));
+
+		UtilPlayer.message(player, F.value("/e tp <Player>", "Teleport to Target"));
+		UtilPlayer.message(player, F.value("/e tp here <Player>", "Teleport Target to Self"));
+		UtilPlayer.message(player, F.value("/e tp here all", "Teleport Everyone to Self"));
+
+		UtilPlayer.message(player, F.value("/e gadget", "Toggle Gadgets"));
+		UtilPlayer.message(player, F.value("/e gadget list", "Lists Gadgets (Shows Whitelist)"));
+		UtilPlayer.message(player, F.value("/e gadget <Gadget>", "Toggles Whitelist for Gadget"));
+		UtilPlayer.message(player, F.value("/e gadget clear", "Clears Gadget Whitelist"));
+
+		UtilPlayer.message(player, F.value("/e silence [Time]", "Silence Chat"));
+
+		UtilPlayer.message(player, F.value("/e admin [Player]", "Toggle Event Admin"));
+
+		UtilPlayer.message(player, F.value("/e gm [Player]", "Toggle Creative Mode"));
+
+		UtilPlayer.message(player, F.value("/e radius [Radius]", "Set Forcefield Radius"));
+
+		UtilPlayer.message(player, F.value("/e give <item> <amount>", "Give Item"));
+		UtilPlayer.message(player, F.value("/e give <player> <item> <amount> [e:#,e:#...]", "Give Item"));
+		
+		UtilPlayer.message(player, F.value("/e doublejump", "Toggles Double Jump"));
+
+		UtilPlayer.message(player, F.value("/e scoreboard <Line #> [Text]", "Sets Scoreboard Text"));
+
+		UtilPlayer.message(player, F.value("/e mob <type> [#Amount] n[Name] s[Size] [angry] [baby]", ""));
+		UtilPlayer.message(player, F.value("/e mob kill <type>", "Kill Mobs"));
+
+		UtilPlayer.message(player, F.value("/e kit set", "Sets Player Kit to your Hotbar"));
+		UtilPlayer.message(player, F.value("/e kit apply", "Gives Kit to Players"));
+		UtilPlayer.message(player, F.value("/e kit clear", "Gives Kit to Players"));
+
+		UtilPlayer.message(player, F.value("/e effect <player> <type> <mult> <seconds>", ""));
+		UtilPlayer.message(player, F.value("/e effect <player> clear", ""));
+	}
+
+	private void commandHelpSettings(Player player) 
+	{
+		UtilPlayer.message(player, F.main("Event", "Displaying Settings Commands;"));
+		UtilPlayer.message(player, F.value("/e damage all", "Toggles All Damage"));
+		UtilPlayer.message(player, F.value("/e damage pvp", "Toggles PvP Damage"));
+		UtilPlayer.message(player, F.value("/e damage pve", "Toggles PvE Damage"));
+		UtilPlayer.message(player, F.value("/e damage pve", "Toggles EvP Damage"));
+		UtilPlayer.message(player, F.value("/e damage fall", "Toggles Fall Damage"));
+		UtilPlayer.message(player, F.value("/e health <-1 to 20>", "Locks Players Health"));
+		UtilPlayer.message(player, F.value("/e hunger <-1 to 20>", "Locks Players Hunger"));
+		UtilPlayer.message(player, F.value("/e item drop", "Toggles Item Drop"));
+		UtilPlayer.message(player, F.value("/e item pickup", "Toggles Item Pickup"));
+		UtilPlayer.message(player, F.value("/e blockplace", "Toggles Block Placing (On/Off)"));
+		UtilPlayer.message(player, F.value("/e blockplace whitelist <add/remove/list/clear> <id>", ""));
+		UtilPlayer.message(player, F.value("/e blockplace blacklist <add/remove/list/clear> <id>", ""));
+		UtilPlayer.message(player, F.value("/e blockbreak", "Toggles Block Breaking (On/Off)"));
+		UtilPlayer.message(player, F.value("/e blockbreak whitelist <add/remove/list/clear> <id>", ""));
+		UtilPlayer.message(player, F.value("/e blockbreak blacklist <add/remove/list/clear> <id>", ""));
+		UtilPlayer.message(player, F.value("/e time <-1 to 24000>", "Sets World Time"));
+		UtilPlayer.message(player, F.value("/e joiningame", "toggles Join In Process for games"));
+		UtilPlayer.message(player, F.value("/e deathout", "toggles Deathout in games"));
+		UtilPlayer.message(player, F.value("/e quitout", "toggles Quitout in games"));
+	}
+
+	//Command Handler
+	@EventHandler(priority = EventPriority.LOWEST)
+	private void commandHandler(PlayerCommandPreprocessEvent event)
+	{	
+		if (!Manager.GetGame().InProgress())
+			return;
+
+		if (!event.getMessage().toLowerCase().startsWith("/e "))
+			return;
+		
+		if(!Manager.GetGameHostManager().isEventServer())
+			return;
+
+		event.setCancelled(true);
+
+		if (!Manager.GetGameHostManager().isAdmin(event.getPlayer(), false))
+			return;
+
+		//Trim off /e and split to args
+		String[] args = event.getMessage().substring(3, event.getMessage().length()).split(" ");
+
+		if (args.length == 0 || args[0].equalsIgnoreCase("help"))
+		{
+			commandHelp(event.getPlayer());
+		}
+		else if (args[0].equalsIgnoreCase("settings"))
+		{
+			if (args.length >= 2 && args[1].equalsIgnoreCase("list"))
+				listSettings(event.getPlayer());
+			else
+				commandHelpSettings(event.getPlayer());
+		}
+
+		//XXX Commands
+		else if (args[0].equalsIgnoreCase("tp"))
+		{
+			commandTeleport(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("gadget"))
+		{
+			commandGadget(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("silence"))
+		{
+			commandSilence(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("admin"))
+		{
+			commandAdmin(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("gm"))
+		{
+			commandGamemode(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("radius"))
+		{
+			commandForcefieldRadius(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("doublejump"))
+		{
+			commandDoubleJump(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("scoreboard"))
+		{
+			commandScoreboard(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("whitelist"))
+		{
+			commandWhitelist(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("give"))
+		{
+			commandGive(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("effect"))
+		{
+			commandEffect(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("kit"))
+		{
+			commandKit(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("mob"))
+		{
+			if (args.length >= 2 && args[1].equalsIgnoreCase("kill"))
+				commandMobKill(event.getPlayer(), args);
+			else
+				commandMob(event.getPlayer(), args);
+		}
+		
+
+		//XXX Settings
+		else if (event.getMessage().toLowerCase().equals("/e damage all"))
+		{
+			Manager.GetGame().Damage = !Manager.GetGame().Damage;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Damage All", F.tf(Manager.GetGame().Damage))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e damage pvp"))
+		{
+			Manager.GetGame().DamagePvP = !Manager.GetGame().DamagePvP;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Damage PvP", F.tf(Manager.GetGame().DamagePvP))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e damage pve"))
+		{
+			Manager.GetGame().DamagePvE = !Manager.GetGame().DamagePvE;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Damage PvE", F.tf(Manager.GetGame().DamagePvE))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e damage evp"))
+		{
+			Manager.GetGame().DamageEvP = !Manager.GetGame().DamageEvP;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Damage EvP", F.tf(Manager.GetGame().DamageEvP))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e damage fall"))
+		{
+			Manager.GetGame().DamageFall = !Manager.GetGame().DamageFall;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Damage Fall", F.tf(Manager.GetGame().DamageFall))));
+		}
+		else if (args[0].equalsIgnoreCase("health"))
+		{
+			commandHealth(event.getPlayer(), args);
+		}
+		else if (args[0].equalsIgnoreCase("hunger"))
+		{
+			commandHunger(event.getPlayer(), args);
+		}
+		else if (event.getMessage().toLowerCase().equals("/e item drop"))
+		{
+			Manager.GetGame().ItemDrop = !Manager.GetGame().ItemDrop;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Item Drop", F.tf(Manager.GetGame().ItemDrop))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e item pickup"))
+		{
+			Manager.GetGame().ItemPickup = !Manager.GetGame().ItemPickup;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Item Pickup", F.tf(Manager.GetGame().ItemPickup))));
+		}
+		else if (event.getMessage().toLowerCase().equals("/e blockplace"))
+		{
+			Manager.GetGame().BlockPlace = !Manager.GetGame().BlockPlace;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Block Place", F.tf(Manager.GetGame().BlockPlace))));
+		}
+		else if (args.length >= 4 && args[0].equalsIgnoreCase("blockplace") 
+				&& (args[1].equalsIgnoreCase("whitelist") || args[1].equalsIgnoreCase("blacklist")))
+		{
+			commandBlockPlace(event.getPlayer(), args, args[1].equalsIgnoreCase("whitelist"), args[2]);
+		}
+		else if (event.getMessage().toLowerCase().equals("/e blockbreak"))
+		{
+			Manager.GetGame().BlockBreak = !Manager.GetGame().BlockBreak;
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Block Break", F.tf(Manager.GetGame().BlockBreak))));
+		}
+		else if (args.length >= 4 && args[0].equalsIgnoreCase("blockbreak") 
+				&& (args[1].equalsIgnoreCase("whitelist") || args[1].equalsIgnoreCase("blacklist")))
+		{
+			commandBlockBreak(event.getPlayer(), args, args[1].equalsIgnoreCase("whitelist"), args[2]);
+		}
+		else if (args[0].equalsIgnoreCase("time"))
+		{
+			commandTime(event.getPlayer(), args);
+		}
+		else if(args[0].equalsIgnoreCase("joiningame"))
+		{
+			commandSpectators(event.getPlayer(), args);
+		}
+		else if(args[0].equalsIgnoreCase("deathout"))
+		{
+			commandDeathout(event.getPlayer(), args);
+		}
+		else if(args[0].equalsIgnoreCase("quitout"))
+		{
+			commandQuitOut(event.getPlayer(), args);
+		}
+	}
+
+	private void listSettings(Player player) 
+	{
+		UtilPlayer.message(player, F.value("Damage All", F.tf(Manager.GetGame().Damage)));
+		UtilPlayer.message(player, F.value("Damage PvP", F.tf(Manager.GetGame().DamagePvP)));
+		UtilPlayer.message(player, F.value("Damage PvE", F.tf(Manager.GetGame().DamagePvE)));
+		UtilPlayer.message(player, F.value("Damage EvP", F.tf(Manager.GetGame().DamageEvP)));
+		UtilPlayer.message(player, F.value("Damage Fall", F.tf(Manager.GetGame().DamageFall)));
+		UtilPlayer.message(player, F.value("Health Set", Manager.GetGame().HealthSet+""));
+		UtilPlayer.message(player, F.value("Hunger Set", Manager.GetGame().HungerSet+""));
+		UtilPlayer.message(player, F.value("Item Pickup", F.tf(Manager.GetGame().ItemPickup)));
+		UtilPlayer.message(player, F.value("Item Drop", F.tf(Manager.GetGame().ItemDrop)));
+		UtilPlayer.message(player, F.value("Block Place", F.tf(Manager.GetGame().BlockPlace)));
+		UtilPlayer.message(player, F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow, true)));
+		UtilPlayer.message(player, F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny, true)));
+		UtilPlayer.message(player, F.value("Block Break", F.tf(Manager.GetGame().BlockPlace)));
+		UtilPlayer.message(player, F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow, true)));
+		UtilPlayer.message(player, F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny, true)));
+		UtilPlayer.message(player, F.value("Time Set", Manager.GetGame().WorldTimeSet+""));
+	}
+
+	private void commandBlockPlace(Player player, String[] args, boolean whitelist, String command)
+	{
+		try
+		{
+			int blockId = Integer.parseInt(args[3]);
+
+			if (whitelist)
+			{
+				if (command.equalsIgnoreCase("add"))
+				{
+					Manager.GetGame().BlockPlaceAllow.add(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Added " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("remove"))
+				{
+					Manager.GetGame().BlockPlaceAllow.remove(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Removed " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("clear"))
+				{
+					Manager.GetGame().BlockPlaceAllow.clear();
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Cleared")));
+				}
+				else if (command.equalsIgnoreCase("list"))
+				{
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow, true))));
+				}
+			}
+			else
+			{
+				if (command.equalsIgnoreCase("add"))
+				{
+					Manager.GetGame().BlockPlaceDeny.add(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Added " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("remove"))
+				{
+					Manager.GetGame().BlockPlaceDeny.remove(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Removed " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("clear"))
+				{
+					Manager.GetGame().BlockPlaceDeny.clear();
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Cleared")));
+				}
+				else if (command.equalsIgnoreCase("list"))
+				{
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny, true))));
+				}
+			}
+
+			return;
+		}
+		catch (Exception e)
+		{
+
+		}
+
+		commandHelpSettings(player);
+	}
+
+	private void commandBlockBreak(Player player, String[] args, boolean whitelist, String command)
+	{
+		try
+		{
+			int blockId = Integer.parseInt(args[3]);
+
+			if (whitelist)
+			{
+				if (command.equalsIgnoreCase("add"))
+				{
+					Manager.GetGame().BlockBreakAllow.add(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Added " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("remove"))
+				{
+					Manager.GetGame().BlockBreakAllow.remove(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Removed " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("clear"))
+				{
+					Manager.GetGame().BlockBreakAllow.clear();
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Cleared")));
+				}
+				else if (command.equalsIgnoreCase("list"))
+				{
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow, true))));
+				}
+			}
+			else
+			{
+				if (command.equalsIgnoreCase("add"))
+				{
+					Manager.GetGame().BlockBreakDeny.add(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Added " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("remove"))
+				{
+					Manager.GetGame().BlockBreakDeny.remove(blockId);
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Removed " + blockId)));
+				}
+				else if (command.equalsIgnoreCase("clear"))
+				{
+					Manager.GetGame().BlockBreakDeny.clear();
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Cleared")));
+				}
+				else if (command.equalsIgnoreCase("list"))
+				{
+					UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny, true))));
+				}
+			}
+
+			return;
+		}
+		catch (Exception e)
+		{
+
+		}
+
+		commandHelpSettings(player);
+	}
+
+	private void commandHealth(Player player, String[] args) 
+	{
+		try
+		{
+			if (args.length >= 2)
+			{
+				int health = Integer.parseInt(args[1]);
+
+				if (health <= 0)
+					health = -1;
+				if (health > 20)
+					health = 20;
+
+				Manager.GetGame().HealthSet = health;
+
+				if (Manager.GetGame().HealthSet == -1)
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Health Set", "Disabled")));
+				else
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Health Set", Manager.GetGame().HealthSet + "")));
+
+				return;
+			}
+		}
+		catch (Exception e)
+		{
+
+		}
+
+		commandHelpSettings(player);
+	}
+
+	private void commandHunger(Player player, String[] args) 
+	{
+		try
+		{
+			if (args.length >= 2)
+			{
+				int hunger = Integer.parseInt(args[1]);
+
+				if (hunger <= 0)
+					hunger = -1;
+				if (hunger > 20)
+					hunger = 20;
+
+				Manager.GetGame().HungerSet = hunger;
+
+				if (Manager.GetGame().HungerSet == -1)
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Hunger Set", "Disabled")));
+				else
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Hunger Set", Manager.GetGame().HungerSet + "")));
+
+				return;
+			}
+		}
+		catch (Exception e)
+		{
+
+		}
+
+		commandHelpSettings(player);
+	}
+
+	private void commandTime(Player player, String[] args) 
+	{
+		try
+		{
+			if (args.length >= 2)
+			{
+				int time = Integer.parseInt(args[1]);
+
+				if (time <= -1)
+					time = -1;
+				if (time > 24000)
+					time = 24000;
+
+				Manager.GetGame().WorldTimeSet = time;
+
+				if (Manager.GetGame().WorldTimeSet == -1)
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Time Set", "Disabled")));
+				else
+					Manager.GetGame().Announce(F.main("Event Settings", F.value("Time Set", Manager.GetGame().WorldTimeSet + "")));
+
+				return;
+			}
+		}
+		catch (Exception e)
+		{
+
+		}
+
+		commandHelpSettings(player);
+	}
+
+	//Teleport Command (To, Here, All)
+	private void commandTeleport(Player player, String[] args)
+	{
+		if (args.length >= 3 && args[1].equalsIgnoreCase("here"))
+		{
+			if (args[2].equalsIgnoreCase("all"))
+			{
+				for (Player other : UtilServer.getPlayers())
+				{
+					UtilPlayer.message(other, F.main("Event TP", player.getName() + " teleported everyone to self."));
+					other.teleport(player);
+				}
+
+				return;
+			}
+
+			Player target = UtilPlayer.searchOnline(player, args[2], true);
+			if (target != null)
+			{
+				target.teleport(player);
+				UtilPlayer.message(target, F.main("Event TP", player.getName() + " teleported you to self."));
+				UtilPlayer.message(player, F.main("Event TP", "Teleported " + target.getName() + " to you."));
+			}
+
+			return;
+		}
+
+		if (args.length >= 2)
+		{
+			Player target = UtilPlayer.searchOnline(player, args[1], true);
+			if (target != null)
+			{
+				player.teleport(target);
+				UtilPlayer.message(player, F.main("Event TP", "Teleported to " + target.getName() + "."));
+			}
+
+			return;
+		}
+
+		commandHelp(player);
+	}
+
+	//Gadget Commands (Global & Individual)
+	private void commandGadget(Player player, String[] args)
+	{
+		if(!(Manager.GetGame() instanceof EventGame)) {
+			UtilPlayer.message(player, F.main("Inventory", "You can only enable/disable gadgets in the Event game!"));
+			return;
+		}
+			
+		if (args.length < 2)
+		{
+			((EventGame) Manager.GetGame()).setAllowGadget(!((EventGame) Manager.GetGame()).isAllowGadget());
+
+			if (!((EventGame) Manager.GetGame()).isAllowGadget())
+			{
+				Manager.getCosmeticManager().getMountManager().DisableAll();
+				Manager.getCosmeticManager().getGadgetManager().DisableAll();
+			}
+
+			Manager.GetGame().Announce(F.main("Inventory", F.value("Allow All Gadgets", F.ed(((EventGame) Manager.GetGame()).isAllowGadget()))));
+			return;
+		}
+
+		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
+		{
+			((EventGame) Manager.GetGame()).getGadgetWhitelist().clear();
+			Manager.GetGame().Announce(F.main("Inventory", F.value("Gadget Whitelist", "Cleared.")));
+			return;
+		}
+
+		if (args.length >= 2 && args[1].equalsIgnoreCase("list"))
+		{
+			ChatColor color = ChatColor.AQUA;
+
+			//Gadgets
+			for (GadgetType type : GadgetType.values())
+			{
+				String items = C.Bold + type + " Gadgets> ";
+
+				for (Gadget gadget : Manager.getCosmeticManager().getGadgetManager().getGadgets(type))
+				{
+					items += color + gadget.GetName().replaceAll(" ", "") + " ";
+					color = (color == ChatColor.AQUA ? ChatColor.DARK_AQUA : ChatColor.AQUA);
+				}
+
+				UtilPlayer.message(player, items);
+			}
+
+			//Mounts
+			String mounts = C.Bold + "Mount Gadgets> ";
+			for (Mount<?> mount : Manager.getCosmeticManager().getMountManager().getMounts())
+			{
+				mounts += color + mount.GetName().replaceAll(" ", "") + " ";
+				color = (color == ChatColor.AQUA ? ChatColor.DARK_AQUA : ChatColor.AQUA);
+			}
+			UtilPlayer.message(player, mounts);
+
+			return;
+		}
+
+		if (args.length >= 2)
+		{
+			//Gadgets
+			for (GadgetType type : GadgetType.values())
+			{
+				for (Gadget gadget : Manager.getCosmeticManager().getGadgetManager().getGadgets(type))
+				{
+					if (gadget.GetName().replaceAll(" ", "").equalsIgnoreCase(args[1]))
+					{
+						if (((EventGame) Manager.GetGame()).getGadgetWhitelist().remove(gadget))
+						{
+							Manager.GetGame().Announce(F.main("Inventory", F.value(gadget.GetName() + " Gadget", F.ed(false))));
+							gadget.DisableForAll();
+						}
+						else
+						{
+							Manager.GetGame().Announce(F.main("Inventory", F.value(gadget.GetName() + " Gadget", F.ed(true))));
+							((EventGame) Manager.GetGame()).getGadgetWhitelist().add(gadget);
+						}
+
+						return;
+					}
+				}
+			}
+
+			//Mounts
+			for (Mount mount : Manager.getCosmeticManager().getMountManager().getMounts())
+			{
+				if (mount.GetName().replaceAll(" ", "").equalsIgnoreCase(args[1]))
+				{
+					if (((EventGame) Manager.GetGame()).getGadgetWhitelist().remove(mount))
+					{
+						Manager.GetGame().Announce(F.main("Inventory", F.value(mount.GetName() + " Gadget", F.ed(false))));
+						mount.DisableForAll();
+					}
+					else
+					{
+						Manager.GetGame().Announce(F.main("Inventory", F.value(mount.GetName() + " Gadget", F.ed(true))));
+						((EventGame) Manager.GetGame()).getGadgetWhitelist().add(mount);
+					}
+
+					return;
+				}
+			}
+
+			UtilPlayer.message(player, F.main("Inventory", args[1] + " is not a valid gadget."));
+
+			return;
+		}
+
+		commandHelp(player);
+	}
+
+	//Silence
+	private void commandSilence(Player player, String[] args)
+	{	
+		try
+		{	
+			//Toggle
+			if (args.length == 1)
+			{
+				//Disable
+				if (Manager.GetChat().Silenced() != 0)
+				{
+					Manager.GetChat().Silence(0, true);
+				}
+				//Enable
+				else
+				{
+					Manager.GetChat().Silence(-1, true);
+				}
+			}
+			//Timer
+			else
+			{
+				long time = (long) (Double.valueOf(args[1]) * 3600000);
+
+				Manager.GetChat().Silence(time, true);
+			}
+		}
+		catch (Exception e)
+		{
+			UtilPlayer.message(player, F.main("Chat", "Invalid Time Parameter."));
+		}
+	}
+
+	//Gamemode (Self and Others)
+	private void commandAdmin(Player player, String[] args)
+	{
+		Player target = player;
+
+		if (args.length >= 2)
+		{
+			Player newTarget = UtilPlayer.searchOnline(player, args[1], true);
+			if (newTarget != null)
+				target = newTarget;
+			else
+				return;
+		}
+
+		if (!Manager.GetGameHostManager().isAdmin(target, false))
+			Manager.GetGameHostManager().giveAdmin(target);
+		else
+			Manager.GetGameHostManager().removeAdmin(target.getName());
+
+		UtilPlayer.message(player, F.main("Event Admin", target.getName() + " Admin: " + F.tf(Manager.GetGameHostManager().isAdmin(target, false))));
+	}
+
+	//Gamemode (Self and Others)
+	private void commandGamemode(Player player, String[] args)
+	{
+		Player target = player;
+
+		if (args.length >= 2)
+		{
+			Player newTarget = UtilPlayer.searchOnline(player, args[1], true);
+			if (newTarget != null)
+				target = newTarget;
+			else
+				return;
+		}
+
+		if (target.getGameMode() == GameMode.CREATIVE)
+			target.setGameMode(GameMode.SURVIVAL);
+		else
+			target.setGameMode(GameMode.CREATIVE);
+
+		UtilPlayer.message(player, F.main("Event GM", target.getName() + " Creative: " + F.tf(target.getGameMode() == GameMode.CREATIVE)));
+	}
+
+	//Forcefield
+	private void commandForcefieldRadius(Player player, String[] args)
+	{
+		
+		if(!(Manager.GetGame() instanceof EventGame)) {
+			UtilPlayer.message(player, F.main("Inventory", "You can only enable/disable the forcefield in the Event game!"));
+			return;
+		}
+		
+		//Toggle
+		if (args.length >= 2)
+		{
+			try
+			{
+				int range = Integer.parseInt(args[1]);
+
+				((EventGame) Manager.GetGame()).getForcefieldList().put(player.getName(), range);
+
+				UtilPlayer.message(player, F.main("Forcefield", "Enabled with  " + F.elem(range + "") + " radius."));
+			}
+			catch (Exception e)
+			{
+				UtilPlayer.message(player, F.main("Forcefield", "Invalid Input."));
+			}
+		}
+		else
+		{
+			((EventGame) Manager.GetGame()).getForcefieldList().remove(player.getName());
+			UtilPlayer.message(player, F.main("Forcefield", "Disabled."));
+		}
+	}
+
+	//Give 
+	private void commandGive(Player player, String[] args)
+	{
+		String[] newArgs = new String[args.length-1];
+
+		for (int i=0 ; i<newArgs.length ; i++)
+			newArgs[i] = args[i+1];
+
+		Give.Instance.parseInput(player, newArgs);  
+	}
+	
+	//Spec 
+	private void commandSpectators(Player player, String[] args)
+	{
+		Manager.GetGame().JoinInProgress = !Manager.GetGame().JoinInProgress;
+		
+		UtilPlayer.message(player, F.main("Settings", "Spectator Join: " + F.tf(Manager.GetGame().JoinInProgress)));
+	}
+	
+	//Deathout 
+	private void commandDeathout(Player player, String[] args)
+	{
+		Manager.GetGame().DeathOut = !Manager.GetGame().DeathOut;
+	
+		UtilPlayer.message(player, F.main("Settings", "Deathout: " + F.tf(Manager.GetGame().DeathOut)));
+	}
+	
+	//QuitOut 
+	private void commandQuitOut(Player player, String[] args)
+	{
+		Manager.GetGame().QuitOut = !Manager.GetGame().QuitOut;
+		
+		UtilPlayer.message(player, F.main("Settings", "QuitOut: " + F.tf(Manager.GetGame().QuitOut)));
+	}
+	
+	//Double Jump
+	private void commandDoubleJump(Player player, String[] args)
+	{
+		
+		if(!(Manager.GetGame() instanceof EventGame)) {
+			UtilPlayer.message(player, F.main("Settings", "You can only enable/disable the Doublejump in the Event game!"));
+			return;
+		}
+		
+		((EventGame) Manager.GetGame()).setDoubleJump(!((EventGame) Manager.GetGame()).isDoubleJump());
+
+		UtilPlayer.message(player, F.main("Settings", "Double Jump: " + F.tf(((EventGame) Manager.GetGame()).isDoubleJump())));
+
+		if (!((EventGame) Manager.GetGame()).isDoubleJump())
+			for (Player other : UtilServer.getPlayers())
+				other.setAllowFlight(false);
+	}
+
+	//Scoreboard
+	private void commandScoreboard(Player player, String[] args)
+	{
+		
+		if(!(Manager.GetGame() instanceof EventGame)) {
+			UtilPlayer.message(player, F.main("Scoreboard", "You can only edit the Scoreboard in the Event game!"));
+			return;
+		}
+		
+		if (args.length >= 2)
+		{
+			//Line
+			int line = 0;
+			try
+			{
+				line = Integer.parseInt(args[1]);
+			}
+			catch (Exception e)
+			{
+				UtilPlayer.message(player, F.main("Scoreboard", "Invalid Line Number."));
+				return;
+			}
+
+			if (line < 1 || line > 14)
+			{
+				UtilPlayer.message(player, F.main("Scoreboard", "Invalid Line Number."));
+				return;
+			}
+
+			//Text
+			String lineText = "";
+
+			//Reset String
+			if (args.length <= 2)
+				for (int i=0 ; i<line ; i++)
+					lineText += " ";
+
+			//New String
+			for (int i=2 ; i<args.length ; i++)
+			{
+				lineText += args[i];
+
+				if (i < args.length -1)
+					lineText += " ";
+			}
+
+			((EventGame) Manager.GetGame()).getSideText()[line] = lineText;	
+
+			UtilPlayer.message(player, F.main("Scoreboard", "Set Line " + F.elem(line+"") + " to " + F.elem(lineText) + "."));
+
+			return;
+		}
+
+		//Clear
+		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
+		{
+			for (int i=0 ; i<((EventGame) Manager.GetGame()).getSideText().length ; i++)
+			{
+				String lineText = "";
+				for (int j=0 ; j<i ; j++)
+					lineText += " ";
+
+				((EventGame) Manager.GetGame()).getSideText()[i] = lineText;
+			}
+
+			return;
+		}
+
+		for (int i=0 ; i<((EventGame) Manager.GetGame()).getSideText().length ; i++)
+		{
+			UtilPlayer.message(player, F.value("Line " + i, ((EventGame) Manager.GetGame()).getSideText()[i]));
+		}
+	}
+
+	//Whitelist
+	private void commandWhitelist(Player player, String[] args)
+	{
+		//On and Off
+		if (args.length >= 2)
+		{
+			if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("off"))
+			{
+				UtilServer.getServer().setWhitelist(args[1].equalsIgnoreCase("on"));
+
+				Manager.GetGame().Announce(F.main("Event Settings", F.value("Whitelist", F.tf(args[1].equalsIgnoreCase("on")))));
+				return;
+			}
+		}
+
+		//Add and Remove
+		if (args.length >= 3)
+		{
+			if (args[1].equalsIgnoreCase("add") || args[1].equalsIgnoreCase("remove"))
+			{
+				OfflinePlayer target = Bukkit.getOfflinePlayer(args[2]);
+
+				if (args[1].equalsIgnoreCase("add"))
+				{
+					UtilServer.getServer().getWhitelistedPlayers().add(target);
+					UtilPlayer.message(player, F.main("Whitelist", "Added " + args[2] + " to the whitelist."));
+				}
+				else
+				{
+					UtilServer.getServer().getWhitelistedPlayers().remove(target);
+					UtilPlayer.message(player, F.main("Whitelist", "Removed " + args[2] + " to the whitelist."));
+				}
+
+				return;
+			}
+		}
+
+		commandHelp(player);
+	}
+
+	//Mob
+	private void commandMob(Player caller, String[] args)
+	{
+		if (args.length == 1)
+		{
+			HashMap<EntityType, Integer> entMap = new HashMap<EntityType, Integer>();
+
+			int count = 0;
+			for (World world : UtilServer.getServer().getWorlds())
+			{
+				for (Entity ent : world.getEntities())
+				{
+					if (!entMap.containsKey(ent.getType()))
+						entMap.put(ent.getType(), 0);
+
+					entMap.put(ent.getType(), 1 + entMap.get(ent.getType()));
+					count++;
+				}
+			}
+
+			UtilPlayer.message(caller, F.main("Creature", "Listing Entities:"));
+			for (EntityType cur : entMap.keySet())
+			{
+				UtilPlayer.message(caller, F.desc(UtilEnt.getName(cur), entMap.get(cur)+""));
+			}
+
+			UtilPlayer.message(caller, F.desc("Total", count+""));
+		}
+		else
+		{
+			EntityType type = UtilEnt.searchEntity(caller, args[1], true);
+
+			if (type == null)
+				return;
+
+			UtilPlayer.message(caller, F.main("Creature", "Spawning Creature(s);"));
+
+			//Store Args
+			HashSet<String> argSet = new HashSet<String>();
+			for (int i = 2 ; i < args.length ; i++)
+				if (args[i].length() > 0)
+					argSet.add(args[i]);
+
+
+			//Search Count
+			int count = 1;
+			HashSet<String> argHandle = new HashSet<String>();
+			for (String arg : argSet)
+			{
+				try
+				{
+					int newCount = Integer.parseInt(arg);
+
+					if (newCount <= 0)
+						continue;
+
+					//Set Count
+					count = newCount;
+					UtilPlayer.message(caller, F.desc("Amount", count+""));
+
+					//Flag Arg
+					argHandle.add(arg);
+					break;
+				}
+				catch (Exception e)
+				{
+					//None
+				}
+			}
+			for (String arg : argHandle)
+				argSet.remove(arg);
+
+			//Spawn
+			HashSet<Entity> entSet = new HashSet<Entity>();
+			for (int i = 0 ; i < count ; i++)
+			{
+				Manager.GetGame().CreatureAllowOverride = true;
+				entSet.add(Manager.GetCreature().SpawnEntity(caller.getTargetBlock(null, 0).getLocation().add(0.5, 1, 0.5), type));
+				Manager.GetGame().CreatureAllowOverride = false;
+			}
+
+			//Search Vars
+			for (String arg : argSet)
+			{
+				if (arg.length() == 0)
+					continue;
+
+				//Baby
+				else if (arg.equalsIgnoreCase("baby") || arg.equalsIgnoreCase("b"))
+				{
+					for (Entity ent : entSet)
+					{
+						if (ent instanceof Ageable)
+							((Ageable)ent).setBaby();
+						else if (ent instanceof Zombie)
+							((Zombie)ent).setBaby(true);
+					}
+
+					UtilPlayer.message(caller, F.desc("Baby", "True"));
+					argHandle.add(arg);
+				}
+
+				//Lock
+				else if (arg.equalsIgnoreCase("age") || arg.equalsIgnoreCase("lock"))
+				{
+					for (Entity ent : entSet)
+						if (ent instanceof Ageable)
+						{
+							((Ageable)ent).setAgeLock(true);
+							UtilPlayer.message(caller, F.desc("Age", "False"));
+						}					
+
+					argHandle.add(arg);
+				}
+
+				//Angry
+				else if (arg.equalsIgnoreCase("angry") || arg.equalsIgnoreCase("a"))
+				{
+					for (Entity ent : entSet)
+						if (ent instanceof Wolf)
+							((Wolf)ent).setAngry(true);
+
+					for (Entity ent : entSet)
+						if (ent instanceof Skeleton)
+							((Skeleton)ent).setSkeletonType(SkeletonType.WITHER);
+
+					UtilPlayer.message(caller, F.desc("Angry", "True"));
+					argHandle.add(arg);
+				}
+
+				//Profession
+				else if (arg.toLowerCase().charAt(0) == 'p')
+				{
+					try
+					{
+						String prof = arg.substring(1, arg.length());
+
+						Profession profession = null;
+						for (Profession cur : Profession.values())
+							if (cur.name().toLowerCase().contains(prof.toLowerCase()))
+								profession = cur;
+
+						UtilPlayer.message(caller, F.desc("Profession", profession.name()));
+
+						for (Entity ent : entSet)
+							if (ent instanceof Villager)
+								((Villager)ent).setProfession(profession);			
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Profession", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);
+				}
+
+				//Size
+				else if (arg.toLowerCase().charAt(0) == 's')
+				{
+					try
+					{
+						String size = arg.substring(1, arg.length());
+
+						UtilPlayer.message(caller, F.desc("Size", Integer.parseInt(size)+""));
+
+						for (Entity ent : entSet)
+							if (ent instanceof Slime)
+								((Slime)ent).setSize(Integer.parseInt(size));
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Size", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);
+				}
+
+				else if (arg.toLowerCase().charAt(0) == 'n' && arg.length() > 1)
+				{
+					try
+					{
+						String name = "";
+
+						for (char c : arg.substring(1, arg.length()).toCharArray())
+						{
+							if (c != '_')
+								name += c;
+							else
+								name += " ";
+						}
+
+						for (Entity ent : entSet)
+						{
+							if (ent instanceof CraftLivingEntity)
+							{
+								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
+								cEnt.setCustomName(name); 
+								cEnt.setCustomNameVisible(true);
+							}
+						}
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Size", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);	
+				}
+			}
+			for (String arg : argHandle)
+				argSet.remove(arg);
+
+			for (String arg : argSet)
+				UtilPlayer.message(caller, F.desc("Unhandled", arg));
+
+			//Inform
+			UtilPlayer.message(caller, F.main("Creature", "Spawned " + count + " " + UtilEnt.getName(type) + "."));
+		}
+	}
+
+	private void commandMobKill(Player caller, String[] args)
+	{
+		if (args.length < 3)
+		{
+			UtilPlayer.message(caller, F.main("Creature", "Missing Entity Type Parameter."));
+			return;
+		}
+
+		EntityType type = UtilEnt.searchEntity(caller, args[2], true);
+
+		if (type == null && !args[2].equalsIgnoreCase("all"))
+			return;
+
+		int count = 0;
+		List<Entity> killList = new ArrayList<Entity>();
+
+		for (World world : UtilServer.getServer().getWorlds())
+		{
+			for (Entity ent : world.getEntities())
+			{
+				if (ent.getType() == EntityType.PLAYER)
+					continue;
+
+				if (type == null || ent.getType() == type)
+				{
+					killList.add(ent);
+				}
+			}
+		}
+
+		CreatureKillEntitiesEvent event = new CreatureKillEntitiesEvent(killList);
+		UtilServer.getServer().getPluginManager().callEvent(event);
+
+		for (Entity entity : event.GetEntities())
+		{
+			entity.remove();
+			count++;
+		}
+
+		String target = "ALL";
+		if (type != null)
+			target = UtilEnt.getName(type);
+
+		UtilPlayer.message(caller, F.main("Creature", "Killed " + target + ". " + count + " Removed."));
+	}
+
+	private void commandKit(Player caller, String[] args)
+	{
+		
+		if(!(Manager.GetGame() instanceof EventGame)) {
+			UtilPlayer.message(caller, F.main("Inventory", "You can only enable/disable a Kit in the Event game!"));
+			return;
+		}
+		
+		if (args.length >= 2 && args[1].equalsIgnoreCase("apply"))
+		{
+			for (Player player : UtilServer.getPlayers())
+				((EventGame) Manager.GetGame()).giveItems(player);
+
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Player Kit", "Applied to Players")));
+			return;
+		}
+
+		if (args.length >= 2 && args[1].equalsIgnoreCase("clear"))
+		{
+			((EventGame) Manager.GetGame()).setKitItems(new ItemStack[6]);
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Player Kit", "Cleared Kit")));
+			return;
+		}
+
+		if (args.length >= 2 && args[1].equalsIgnoreCase("set"))
+		{
+			((EventGame) Manager.GetGame()).setKitItems(new ItemStack[6]);
+
+			for (int i=0 ; i<6 ; i++)
+			{
+				if (caller.getInventory().getItem(i) != null)
+					((EventGame) Manager.GetGame()).getKitItems()[i] = caller.getInventory().getItem(i).clone();
+				else
+					((EventGame) Manager.GetGame()).getKitItems()[i] = null;
+			}
+
+			Manager.GetGame().Announce(F.main("Event Settings", F.value("Player Kit", "Updated Items")));
+			return;
+		}
+
+		commandHelp(caller);
+	}
+
+	private void commandEffect(Player caller, String[] args)
+	{
+		//Clear
+		if (args.length >= 3 && args[2].equalsIgnoreCase("clear"))
+		{
+			//Get Targets
+			LinkedList<Player> targets = new LinkedList<Player>();
+
+			if (args[1].equalsIgnoreCase("all"))
+			{
+				for (Player cur : UtilServer.getPlayers())
+					targets.add(cur);
+				
+				_potionEffectsDuration.clear();
+				_potionEffectsMult.clear();
+			}
+			else
+			{
+				targets = UtilPlayer.matchOnline(caller, args[1], true);
+				if (targets.isEmpty())			
+					return;
+			}
+
+			for (Player player : targets)
+			{
+				//Remove all conditions
+				Manager.GetCondition().EndCondition(player, null, null);
+
+				//Remove all effects
+				player.removePotionEffect(PotionEffectType.ABSORPTION);
+				player.removePotionEffect(PotionEffectType.BLINDNESS);
+				player.removePotionEffect(PotionEffectType.CONFUSION);
+				player.removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE);
+				player.removePotionEffect(PotionEffectType.FAST_DIGGING);
+				player.removePotionEffect(PotionEffectType.FIRE_RESISTANCE);
+				player.removePotionEffect(PotionEffectType.HARM);
+				player.removePotionEffect(PotionEffectType.HEAL);
+				player.removePotionEffect(PotionEffectType.HEALTH_BOOST);
+				player.removePotionEffect(PotionEffectType.HUNGER);
+				player.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);
+				player.removePotionEffect(PotionEffectType.INVISIBILITY);
+				player.removePotionEffect(PotionEffectType.JUMP);
+				player.removePotionEffect(PotionEffectType.NIGHT_VISION);
+				player.removePotionEffect(PotionEffectType.POISON);
+				player.removePotionEffect(PotionEffectType.REGENERATION);
+				player.removePotionEffect(PotionEffectType.SATURATION);
+				player.removePotionEffect(PotionEffectType.SLOW);
+				player.removePotionEffect(PotionEffectType.SLOW_DIGGING);
+				player.removePotionEffect(PotionEffectType.SPEED);
+				player.removePotionEffect(PotionEffectType.WATER_BREATHING);
+				player.removePotionEffect(PotionEffectType.WEAKNESS);
+				player.removePotionEffect(PotionEffectType.WITHER);	
+			}
+
+			return;
+		}
+
+		//Apply
+		if (args.length >= 5)
+		{
+
+			//Get Type
+			PotionEffectType type = PotionEffectType.getByName(args[2]);
+			if (type == null)
+			{
+				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Type: " + args[2]));
+				UtilPlayer.message(caller, F.value("Valid Types", "http://minecraft.gamepedia.com/Status_effect"));
+				return;
+			}		
+
+			//Get Multiplier
+			int mult = 0;
+			try
+			{
+				mult = Integer.parseInt(args[3]);
+
+				if (mult <= 0)
+					mult = 0;
+				if (mult > 255)
+					mult = 255;				
+			}
+			catch (Exception e)
+			{
+				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Level: " + args[3]));
+				return;
+			}
+
+			//Get Duration
+			int dur = 0;
+			try
+			{
+				dur = Integer.parseInt(args[4]);
+
+				if (dur <= 0)
+					dur = 0;			
+			}
+			catch (Exception e)
+			{
+				UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Duration: " + args[4]));
+				return;
+			}
+			
+			//Get Targets
+			LinkedList<Player> targets = new LinkedList<Player>();
+
+			if (args[1].equalsIgnoreCase("all"))
+			{
+				for (Player cur : UtilServer.getPlayers())
+					targets.add(cur);
+				
+				_potionEffectsDuration.put(type, (long) (System.currentTimeMillis() + (dur * 1000)));
+				_potionEffectsMult.put(type, mult);
+			}
+			else
+			{
+				targets = UtilPlayer.matchOnline(caller, args[1], true);
+				if (targets.isEmpty())			
+					return;
+			}
+
+			//Apply
+			PotionEffect effect = new PotionEffect(type, dur*20, mult);
+			for (Player cur : targets)
+			{
+				cur.addPotionEffect(effect);
+			}
+
+			if (args[1].equalsIgnoreCase("all"))
+				Manager.GetGame().Announce(F.main("Effect", F.value("Applied Effect", type.getName() + " " + (mult+1) + " for " + dur + "s")));
+			else
+				UtilPlayer.message(caller, F.main("Effect", "Applied " + type.getName() + " " + (mult+1) + " for " + dur + "s for Targets."));
+
+			return;
+		}
+
+		commandHelp(caller);
+	}
+	
+	@EventHandler
+	public void updatePotionEffects(UpdateEvent event)
+	{
+		if(event.getType() != UpdateType.SEC)
+			return;
+		
+		for(Player player : UtilServer.getPlayers()) 
+		{
+			for(PotionEffectType effect : _potionEffectsDuration.keySet())
+			{
+				player.addPotionEffect(new PotionEffect(effect, (int) (((_potionEffectsDuration.get(effect) - System.currentTimeMillis()) / 1000) * 20), _potionEffectsMult.get(effect)));
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
index 0f8f37712..6eb27a139 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
@@ -77,7 +77,7 @@ public class GameChatManager implements Listener
 		}
 		else if (Manager.GetGameHostManager().isAdmin(event.getPlayer(), false))
 		{
-			if (Manager.GetGame() != null && Manager.GetGame().GetType() == GameType.Event)
+			if (Manager.GetGameHostManager().isEventServer())
 				rankStr = C.cDGreen + C.Bold + "Event Admin ";
 			else
 				rankStr = C.cDGreen + C.Bold +  "MPS Admin ";
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index ccb1c54ae..4136de188 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -17,6 +17,7 @@ import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.games.event.EventModule;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
 import org.bukkit.Bukkit;
@@ -29,6 +30,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -534,28 +537,6 @@ public class GameHostManager implements Listener
 			return 4;
 	}
 	
-	@EventHandler
-	public void setHostDebug(PlayerCommandPreprocessEvent event)
-	{
-		if (!event.getPlayer().isOp())
-			return;
-		
-		if (!event.getMessage().toLowerCase().startsWith("/sethost "))
-			return;
-		
-		Manager.GetServerConfig().HostName = event.getMessage().split(" ")[1];
-
-		event.getPlayer().sendMessage("Set host to: " + event.getMessage().split(" ")[1]);
-
-		_host = Bukkit.getPlayerExact(Manager.GetServerConfig().HostName);
-		if (_host != null)
-			_hostRank = Manager.GetClients().Get(_host).GetRank();
-		
-		setDefaultConfig();
-		
-		event.setCancelled(true);
-	}
-	
 	@EventHandler
 	public void setEventGame(PlayerCommandPreprocessEvent event)
 	{
@@ -648,4 +629,25 @@ public class GameHostManager implements Listener
 	{
 		_isEventServer = var;
 	}
+	
+	public Rank getHostRank()
+	{
+		return _hostRank;
+	}
+	
+	public void setHostRank(Rank rank)
+	{
+		_hostRank = rank;
+	}
+	
+	public Player getHost()
+	{
+		return _host;
+	}
+	
+	public void setHost(Player player)
+	{
+		_host = player;
+	}
+	
 }

From 5deb699b0237e67da93b619b8462a6edbc5fb62e Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Thu, 23 Jul 2015 18:24:41 +0100
Subject: [PATCH 037/113] Added rejected games and whitelist to MPS.

---
 Plugins/.idea/compiler.xml                    | 28 ++++++++++++++++++-
 Plugins/.idea/encodings.xml                   | 10 +++++--
 Plugins/.idea/misc.xml                        |  7 +++++
 Plugins/.idea/modules.xml                     |  4 +++
 .../game/arcade/game/GameServerConfig.java    |  2 ++
 .../privateServer/page/EditRotationPage.java  | 19 +++++++++++++
 .../gui/privateServer/page/OptionsPage.java   |  4 +--
 .../gui/privateServer/page/SetGamePage.java   | 21 ++++++++++++++
 .../game/arcade/managers/GameHostManager.java | 20 +++++++++++++
 9 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml
index 2e4d3e99b..b2c160566 100644
--- a/Plugins/.idea/compiler.xml
+++ b/Plugins/.idea/compiler.xml
@@ -21,8 +21,34 @@
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
+      <profile default="false" name="Annotation profile for hub" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="hub" />
+      </profile>
+      <profile default="false" name="Annotation profile for gameplay" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="gameplay" />
+      </profile>
+      <profile default="false" name="Annotation profile for common" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="common" />
+      </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="1.7" />
+    <bytecodeTargetLevel target="1.7">
+      <module name="common" target="1.7" />
+      <module name="gameplay" target="1.7" />
+      <module name="hub" target="1.7" />
+      <module name="parent" target="1.7" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="GENERATE_NO_WARNINGS" value="true" />
diff --git a/Plugins/.idea/encodings.xml b/Plugins/.idea/encodings.xml
index e206d70d8..d4f862411 100644
--- a/Plugins/.idea/encodings.xml
+++ b/Plugins/.idea/encodings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$/ParkerFactions" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ParkerFactions/common" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ParkerFactions/gameplay" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ParkerFactions/hub" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml
index 76fba6e9f..5a73d09c7 100644
--- a/Plugins/.idea/misc.xml
+++ b/Plugins/.idea/misc.xml
@@ -7,6 +7,13 @@
     </list>
   </component>
   <component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/ParkerFactions/pom.xml" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml
index bf0ac4bae..1b0feef52 100644
--- a/Plugins/.idea/modules.xml
+++ b/Plugins/.idea/modules.xml
@@ -18,6 +18,10 @@
       <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" filepath="$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" filepath="$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" filepath="$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" group="Game" />
+      <module fileurl="file://$PROJECT_DIR$/ParkerFactions/common/common.iml" filepath="$PROJECT_DIR$/ParkerFactions/common/common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ParkerFactions/gameplay/gameplay.iml" filepath="$PROJECT_DIR$/ParkerFactions/gameplay/gameplay.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ParkerFactions/hub/hub.iml" filepath="$PROJECT_DIR$/ParkerFactions/hub/hub.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ParkerFactions/parent.iml" filepath="$PROJECT_DIR$/ParkerFactions/parent.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java
index 3ea703536..0e1e2ac03 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java
@@ -36,6 +36,8 @@ public class GameServerConfig
 	public boolean PlayerKickIdle = true;
 	
 	public boolean PublicServer = true;
+
+	public boolean PlayerServerWhitelist = false;
 	
 	public boolean IsValid()
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index 61b472974..9cc48a9ff 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -1,5 +1,6 @@
 package nautilus.game.arcade.gui.privateServer.page;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.ChatColor;
@@ -9,6 +10,7 @@ import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.game.GameCategory;
 import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
@@ -30,6 +32,8 @@ public class EditRotationPage extends BasePage
 
 		List<GameType> enabledGames = getPlugin().GetServerConfig().GameList;
 
+		//Old code I'm not removing in-case the old style is wanted. - William
+		/*
 		int arcadeSlot = 9;
 		int classicSlot = 13;
 		int survivalSlot = 15;
@@ -64,6 +68,21 @@ public class EditRotationPage extends BasePage
 
 			addGameButton(slot, type, enabledGames.contains(type));
 		}
+		*/
+
+		ArrayList<GameCategory> allowedCats = new ArrayList<GameCategory>();
+		allowedCats.add(GameCategory.ARCADE);
+		allowedCats.add(GameCategory.CLASSICS);
+		allowedCats.add(GameCategory.SURVIVAL);
+		allowedCats.add(GameCategory.CHAMPIONS);
+		allowedCats.add(GameCategory.EXTRA);
+
+		int gameSlot = 9;
+		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		{
+			gameSlot++;
+			addGameButton(gameSlot, type, enabledGames.contains(type));
+		}
 	}
 
 	private void addGameButton(int slot, final GameType type, boolean enabled)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
index 9247d2831..1b7dbaf12 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
@@ -43,7 +43,7 @@ public class OptionsPage extends BasePage
 			}
 		});
 		
-		buildPreference(13, Material.PAPER, "Enforce Whitelist (Coming Soon)", false, new IButton()
+		buildPreference(13, Material.PAPER, "Enforce Whitelist", _config.PlayerServerWhitelist, new IButton()
 		{
 			@Override
 			public void onClick(Player player, ClickType clickType)
@@ -116,7 +116,7 @@ public class OptionsPage extends BasePage
 
 	private void toggleWhitelist()
 	{
-		// TODO CHISSPIE
+		_config.PlayerServerWhitelist = !_config.PlayerServerWhitelist;
 		refresh();
 	}
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 8e651c664..8c4cd9ae6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -1,10 +1,14 @@
 package nautilus.game.arcade.gui.privateServer.page;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import mineplex.core.common.util.C;
+import mineplex.core.game.GameCategory;
 import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import nautilus.game.arcade.ArcadeManager;
@@ -24,6 +28,8 @@ public class SetGamePage extends BasePage
 	{
 		addBackButton(4);
 
+		//Old code I'm not removing in-case you want the old style - William.
+		/*
 		int arcadeSlot = 9;
 		int classicSlot = 13;
 		int survivalSlot = 15;
@@ -58,6 +64,21 @@ public class SetGamePage extends BasePage
 
 			addGameButton(slot, type);
 		}
+		*/
+
+		ArrayList<GameCategory> allowedCats = new ArrayList<GameCategory>();
+		allowedCats.add(GameCategory.ARCADE);
+		allowedCats.add(GameCategory.CLASSICS);
+		allowedCats.add(GameCategory.SURVIVAL);
+		allowedCats.add(GameCategory.CHAMPIONS);
+		allowedCats.add(GameCategory.EXTRA);
+
+		int gameSlot = 9;
+		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		{
+			gameSlot++;
+			addGameButton(gameSlot, type);
+		}
 	}
 
 	private void addGameButton(int slot, final GameType type)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index ccb1c54ae..eedad1b34 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -32,6 +32,7 @@ import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 
@@ -113,6 +114,14 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.SmashTeams);
 		legendGames.add(GameType.SpleefTeams);
 		legendGames.add(GameType.SurvivalGamesTeams);
+		//Rejected / Other
+		legendGames.add(GameType.Evolution);
+		legendGames.add(GameType.Gravity);
+		legendGames.add(GameType.MilkCow);
+		legendGames.add(GameType.SearchAndDestroy);
+		legendGames.add(GameType.SnowFight);
+		legendGames.add(GameType.WitherAssault);
+		legendGames.add(GameType.ZombieSurvival);
 
 		//Config Defaults
 		if (Manager.GetHost() != null && Manager.GetHost().length() > 0)
@@ -151,6 +160,17 @@ public class GameHostManager implements Listener
 		}
 	}
 
+	@EventHandler
+	public void whitelistJoin(PlayerLoginEvent event)
+	{
+		Player p = event.getPlayer();
+		if (Manager.GetServerConfig().PlayerServerWhitelist){
+			if (!getWhitelist().contains(p.getName())){
+				Manager.GetPortal().sendToHub(p, "You aren't on the whitelist of this Mineplex Private Server.");
+			}
+		}
+	}
+
 	@EventHandler
 	public void adminJoin(PlayerJoinEvent event)
 	{

From 9a3c4f3a00896fce6a02b91badd06a4daf2f78a0 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 23 Jul 2015 17:46:10 -0400
Subject: [PATCH 038/113] Added Ninja Kit to OITQ. New Achievement kit.

---
 .../game/arcade/game/games/quiver/Quiver.java | 33 ++++---
 .../game/games/quiver/kits/KitNinja.java      | 56 +++++++++++
 .../game/games/quiver/kits/KitSlamShot.java   |  9 +-
 .../game/arcade/kit/perks/PerkVanishing.java  | 93 +++++++++++++++++++
 4 files changed, 172 insertions(+), 19 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitNinja.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
index bbd123b34..fd03769da 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
@@ -5,18 +5,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.EntityShootBowEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.scoreboard.DisplaySlot;
-import org.bukkit.scoreboard.Objective;
-
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilPlayer;
@@ -32,12 +20,28 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.SoloGame;
-import nautilus.game.arcade.game.games.quiver.kits.*;
+import nautilus.game.arcade.game.games.quiver.kits.KitBrawler;
+import nautilus.game.arcade.game.games.quiver.kits.KitEnchanter;
+import nautilus.game.arcade.game.games.quiver.kits.KitLeaper;
+import nautilus.game.arcade.game.games.quiver.kits.KitNinja;
+import nautilus.game.arcade.game.games.quiver.kits.KitSlamShot;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.stats.SharpShooterStatTracker;
 import nautilus.game.arcade.stats.WinWithoutBowStatTracker;
 import nautilus.game.arcade.stats.WinWithoutDyingStatTracker;
 
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.scoreboard.DisplaySlot;
+import org.bukkit.scoreboard.Objective;
+
 public class Quiver extends SoloGame
 {
 	private ArrayList<QuiverScore> _ranks = new ArrayList<QuiverScore>();
@@ -56,7 +60,8 @@ public class Quiver extends SoloGame
 				new KitLeaper(manager),
 				new KitBrawler(manager),
 				new KitEnchanter(manager),
-				new KitSlamShot(manager)
+				new KitSlamShot(manager),
+				new KitNinja(manager)
 						},
 
 						new String[]
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitNinja.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitNinja.java
new file mode 100644
index 000000000..21636cee3
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitNinja.java
@@ -0,0 +1,56 @@
+package nautilus.game.arcade.game.games.quiver.kits;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.itemstack.ItemStackFactory;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkVanishing;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+public class KitNinja extends Kit
+{
+	public KitNinja(ArcadeManager manager)
+	{
+		super(manager, "Ninja", KitAvailability.Achievement, 0, new String[]
+				{
+				"You're a sneaky one, you!"
+				}, new Perk[]
+						{
+				new PerkVanishing()
+						}, EntityType.ZOMBIE, new ItemBuilder(Material.GOLD_SWORD).build());
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().addItem(new ItemBuilder(Material.GOLD_SWORD).setUnbreakable(true).build());
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
+		
+		if (Manager.GetGame().GetState() == GameState.Live)
+		{
+			player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(262, (byte)0, 1, F.item("Super Arrow")));
+			
+			final Player fPlayer = player;
+			
+			UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
+			{
+				public void run()
+				{
+					UtilInv.Update(fPlayer);
+				}
+			}, 10);
+		}
+	}
+
+	
+	
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitSlamShot.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitSlamShot.java
index 6acd3aea3..543a7c58b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitSlamShot.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitSlamShot.java
@@ -21,9 +21,8 @@ public class KitSlamShot extends Kit
 {
 	public KitSlamShot(ArcadeManager manager)
 	{
-		super(manager, "Slam Shooter", KitAvailability.Achievement, 
-
-				new String[] 
+		super(manager, "Slam Shooter", KitAvailability.Gem, 
+				5000, new String[] 
 						{
 				"Gets 2 arrows for killing slammed players!"
 						}, 
@@ -33,7 +32,7 @@ public class KitSlamShot extends Kit
 				new PerkSeismicSlamOITQ()
 								}, 
 								EntityType.ZOMBIE,
-								new ItemStack(Material.IRON_SPADE));
+								new ItemStack(Material.DIAMOND_SPADE));
 
 		this.setAchievementRequirements(new Achievement[] 
 				{
@@ -47,7 +46,7 @@ public class KitSlamShot extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE));
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SPADE));
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
 		
 		if (Manager.GetGame().GetState() == GameState.Live)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java
new file mode 100644
index 000000000..cc09980fa
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java
@@ -0,0 +1,93 @@
+package nautilus.game.arcade.kit.perks;
+
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class PerkVanishing extends Perk
+{
+	public PerkVanishing()
+	{
+		super("Vanishing Act", new String[]
+				{
+				"Become invisible for two seconds after a melee kill.",
+				"You will lose invisibility if you attack or charge your bow."
+				});
+	}
+
+	@EventHandler
+	public void kill(CombatDeathEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		//If it's an arrow kill (OITQ)
+		if (!event.GetLog().GetKiller().GetReason().toLowerCase().contains("instagib"))
+			return;
+		
+		if (!event.GetLog().GetKiller().IsPlayer())
+			return;
+		
+		Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
+		
+		if (killer == null)
+			return;
+		
+		if (!Manager.IsAlive(killer))
+			return;
+		
+		if (!Kit.HasKit(killer))
+			return;
+		
+		Manager.GetCondition().Factory().Cloak("Vanishing Act", killer, null, 2, false, true);
+	}
+	
+	@EventHandler
+	public void remove(CustomDamageEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		Player damager = event.GetDamagerPlayer(true);
+		
+		if (damager == null)
+			return;
+		
+		if (!Manager.IsAlive(damager))
+			return;
+		
+		if (!Kit.HasKit(damager))
+			return;
+		
+		if (Manager.GetCondition().IsCloaked(damager))
+			Manager.GetCondition().Clean(damager);
+	}
+	
+	@EventHandler
+	public void remove(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!Kit.HasKit(player))
+				continue;
+			
+			if (!UtilPlayer.isChargingBow(player))
+				continue;
+			
+			if (Manager.GetCondition().IsCloaked(player))
+				Manager.GetCondition().Clean(player);
+		}
+	}
+}

From 609199a6b8e372acdfa04fcf2fd4e2b87caf34ff Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 24 Jul 2015 13:14:41 +0200
Subject: [PATCH 039/113] Improving Team names in Team games.

---
 .../src/nautilus/game/arcade/game/Game.java   |   1 +
 .../nautilus/game/arcade/game/GameTeam.java   |  20 +++-
 .../game/games/skywars/TeamSkywars.java       | 100 ++++++-----------
 .../arcade/game/games/smash/SuperSmash.java   |   2 +
 .../game/games/smash/TeamSuperSmash.java      | 102 ++++++-----------
 .../games/survivalgames/SurvivalGames.java    |   2 +
 .../survivalgames/TeamSurvivalGames.java      | 104 +++++++-----------
 .../arcade/managers/GameLobbyManager.java     |  17 ++-
 .../arcade/scoreboard/GameScoreboard.java     |   9 +-
 9 files changed, 152 insertions(+), 205 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index bad4fd5a9..a59565071 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -262,6 +262,7 @@ public abstract class Game implements Listener
 	public boolean CanGiveLoot = true;
 	
 	public boolean HideTeamSheep = false;
+	public boolean ReplaceTeamsWithKits = false;
 	
 	public boolean VersionRequire1_8 = false;
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index bc6940d90..d73da8f35 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -68,10 +68,12 @@ public class GameTeam
 
 	private boolean _visible = true;
 
+	private boolean _displayTag;
+	
 	//Records order players go out in
 	protected ArrayList<Player> _places = new ArrayList<Player>();
 
-	public GameTeam(Game host, String name, ChatColor color, ArrayList<Location> spawns)
+	public GameTeam(Game host, String name, ChatColor color, ArrayList<Location> spawns, boolean tags)
 	{
 		Host = host;
 
@@ -79,6 +81,12 @@ public class GameTeam
 		_name = name;
 		_color = color;
 		_spawns = spawns;
+		_displayTag = tags;
+	}
+	
+	public GameTeam(Game host, String name, ChatColor color, ArrayList<Location> spawns)
+	{
+		this(host, name, color, spawns, false);
 	}
 
 	public String GetName()
@@ -349,6 +357,16 @@ public class GameTeam
 	{
 		return _visible;
 	}
+	
+	public void setDisplayTag(boolean b)
+	{
+		_displayTag = b;
+	}
+	
+	public boolean GetDisplaytag()
+	{
+		return _displayTag;
+	}
 
 	public void SetRespawnTime(double i)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index a74dee780..91a8ce944 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -78,7 +78,19 @@ public class TeamSkywars extends Skywars
 			
 			//Got Spawns
 			color = getNextColor(color);
-			GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+			int e = 0;
+			for(GameTeam teams : GetTeamList())
+			{
+				if(teams.GetColor() == color.getColor())
+				{
+					e++;
+					if(getColorName(color.getColor()).length <= e)
+					{
+						e = 0;
+					}
+				}
+			}
+			GameTeam team = new GameTeam(this, getColorName(color.getColor())[e], color.getColor(), spawns, true);
 			team.SetVisible(true);
 			GetTeamList().add(team);	
 		}
@@ -122,50 +134,51 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, "Yellow"),
-		GREEN(ChatColor.GREEN, "Green"),
-		AQUA(ChatColor.AQUA, "Aqua"),
-		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
-		GOLD(ChatColor.GOLD, "Gold"),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
-		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
-		WHITE(ChatColor.WHITE, "White"),
-		BLUE(ChatColor.BLUE, "Blue"),
-		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
-		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
+		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
+		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
+		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
+		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
+		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
+		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
 		
 		private ChatColor color;
-		private String name;
+		private String[] names;
 		
-		private TeamColors(ChatColor color, String name)
+		private TeamColors(ChatColor color, String[] names)
 		{
 			this.color = color;
-			this.name = name;
+			this.names = names;
 		}
 		
 		public ChatColor getColor()
 		{
-			return this.color;
+			return color;
 		}
 		
-		public String toString()
+		public String[] getNames()
 		{
-			return this.name;
+			return names;
 		}
 		
 	}
 	
-	private String getColorName(ChatColor color)
+	private String[] getColorName(ChatColor color)
 	{
 		for(TeamColors colors : TeamColors.values())
 		{
 			if(colors.getColor() == color)
 			{
-				return colors.toString();
+				return colors.getNames();
 			}
 		}
-		return "";
+		return null;
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -319,36 +332,6 @@ public class TeamSkywars extends Skywars
 	{
 		return team.GetSize() < 2;
 	}
-
-	@EventHandler
-	public void TeamRename(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Live)
-			return;
-
-		for (GameTeam team : GetTeamList())
-		{
-			// Big Team
-			if (team.GetSize() > 2)
-			{
-				team.SetName("Team " + team.GetName());
-				continue;
-			}
-
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
-		}
-	}
 	
 	@EventHandler(priority = EventPriority.HIGH)
 	public void teamSelectInteract(PlayerInteractEntityEvent event)
@@ -426,19 +409,6 @@ public class TeamSkywars extends Skywars
 			GameTeam team = getEmptyTeam();
 			if (team == null)
 				return;
-				
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
 			
 			//Join Team
 			SetPlayerTeam(player, team, true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 3920e721e..06598d636 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -126,6 +126,8 @@ public abstract class SuperSmash extends Game
 		
 		this.HideTeamSheep = true;
 		
+		this.ReplaceTeamsWithKits = true;
+		
 		// Add stat table here
 		// Example
 		// Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses");
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 39989f20a..a9e83cdc9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -131,9 +131,21 @@ public class TeamSuperSmash extends SuperSmash
 			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
 			{
 				color = getNextColor(color);
-				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				int e = 0;
+				for(GameTeam teams : GetTeamList())
+				{
+					if(teams.GetColor() == color.getColor())
+					{
+						e++;
+						if(getColorName(color.getColor()).length <= e)
+						{
+							e = 0;
+						}
+					}
+				}
+				GameTeam team = new GameTeam(this, getColorName(color.getColor())[e], color.getColor(), spawns, true);
 				team.SetVisible(true);
-				GetTeamList().add(team);
+				GetTeamList().add(team);	
 			}
 		}
 	}
@@ -141,50 +153,51 @@ public class TeamSuperSmash extends SuperSmash
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, "Yellow"),
-		GREEN(ChatColor.GREEN, "Green"),
-		AQUA(ChatColor.AQUA, "Aqua"),
-		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
-		GOLD(ChatColor.GOLD, "Gold"),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
-		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
-		WHITE(ChatColor.WHITE, "White"),
-		BLUE(ChatColor.BLUE, "Blue"),
-		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
-		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
+		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
+		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
+		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
+		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
+		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
+		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
 		
 		private ChatColor color;
-		private String name;
+		private String[] names;
 		
-		private TeamColors(ChatColor color, String name)
+		private TeamColors(ChatColor color, String[] names)
 		{
 			this.color = color;
-			this.name = name;
+			this.names = names;
 		}
 		
 		public ChatColor getColor()
 		{
-			return this.color;
+			return color;
 		}
 		
-		public String toString()
+		public String[] getNames()
 		{
-			return this.name;
+			return names;
 		}
 		
 	}
 	
-	private String getColorName(ChatColor color)
+	private String[] getColorName(ChatColor color)
 	{
 		for(TeamColors colors : TeamColors.values())
 		{
 			if(colors.getColor() == color)
 			{
-				return colors.toString();
+				return colors.getNames();
 			}
 		}
-		return "";
+		return null;
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -265,36 +278,6 @@ public class TeamSuperSmash extends SuperSmash
 	{
 		return team.GetSize() < PlayersPerTeam;
 	}
-
-	@EventHandler
-	public void TeamRename(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Live)
-			return;
-
-		for (GameTeam team : GetTeamList())
-		{
-			// Big Team
-			if (team.GetSize() > PlayersPerTeam)
-			{
-				team.SetName("Team " + team.GetName());
-				continue;
-			}
-
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
-		}
-	}
 	
 	@EventHandler(priority = EventPriority.HIGH)
 	public void teamSelectInteract(PlayerInteractEntityEvent event)
@@ -372,19 +355,6 @@ public class TeamSuperSmash extends SuperSmash
 			GameTeam team = getEmptyTeam();
 			if (team == null)
 				return;
-				
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
 			
 			//Join Team
 			SetPlayerTeam(player, team, true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 7d0ee4f2f..ce66cd5bd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -211,6 +211,8 @@ public abstract class SurvivalGames extends Game
 		StrictAntiHack = true;
 		
 		HideTeamSheep = true;
+		
+		this.ReplaceTeamsWithKits = true;
 
 		GameTimeout = 1500000;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index f914fa886..7e4339e97 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -82,11 +82,23 @@ public class TeamSurvivalGames extends SurvivalGames
 		{
 			for(int i = 1; i <= Manager.GetPlayerFull() / this.PlayersPerTeam; i++)
 			{
-				System.out.println("Test");
+				//Got Spawns
 				color = getNextColor(color);
-				GameTeam team = new GameTeam(this, String.valueOf(i), color.getColor(), spawns);
+				int e = 0;
+				for(GameTeam teams : GetTeamList())
+				{
+					if(teams.GetColor() == color.getColor())
+					{
+						e++;
+						if(getColorName(color.getColor()).length <= e)
+						{
+							e = 0;
+						}
+					}
+				}
+				GameTeam team = new GameTeam(this, getColorName(color.getColor())[e], color.getColor(), spawns, true);
 				team.SetVisible(true);
-				GetTeamList().add(team);
+				GetTeamList().add(team);	
 			}
 		}
 	}
@@ -94,50 +106,51 @@ public class TeamSurvivalGames extends SurvivalGames
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, "Yellow"),
-		GREEN(ChatColor.GREEN, "Green"),
-		AQUA(ChatColor.AQUA, "Aqua"),
-		DARK_RED(ChatColor.DARK_RED, "Dark Red"),
-		GOLD(ChatColor.GOLD, "Gold"),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, "Light Purple"),
-		DARK_BLUE(ChatColor.DARK_BLUE, "Dark Blue"),
-		WHITE(ChatColor.WHITE, "White"),
-		BLUE(ChatColor.BLUE, "Blue"),
-		DARK_GREEN(ChatColor.DARK_GREEN, "Dark Green"),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, "Dark Purple"),
-		DARK_AQUA(ChatColor.DARK_AQUA, "Cyan");
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
+		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
+		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
+		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
+		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
+		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
+		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
 		
 		private ChatColor color;
-		private String name;
+		private String[] names;
 		
-		private TeamColors(ChatColor color, String name)
+		private TeamColors(ChatColor color, String[] names)
 		{
 			this.color = color;
-			this.name = name;
+			this.names = names;
 		}
 		
 		public ChatColor getColor()
 		{
-			return this.color;
+			return color;
 		}
 		
-		public String toString()
+		public String[] getNames()
 		{
-			return this.name;
+			return names;
 		}
 		
 	}
 	
-	private String getColorName(ChatColor color)
+	private String[] getColorName(ChatColor color)
 	{
 		for(TeamColors colors : TeamColors.values())
 		{
 			if(colors.getColor() == color)
 			{
-				return colors.toString();
+				return colors.getNames();
 			}
 		}
-		return "";
+		return null;
 	}
 	
 	private TeamColors getNextColor(TeamColors color) 
@@ -289,36 +302,6 @@ public class TeamSurvivalGames extends SurvivalGames
 	{
 		return team.GetSize() < PlayersPerTeam;
 	}
-
-	@EventHandler
-	public void TeamRename(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Live)
-			return;
-
-		for (GameTeam team : GetTeamList())
-		{
-			// Big Team
-			if (team.GetSize() > PlayersPerTeam)
-			{
-				team.SetName("Team " + team.GetName());
-				continue;
-			}
-
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
-		}
-	}
 	
 	@EventHandler(priority = EventPriority.HIGH)
 	public void teamSelectInteract(PlayerInteractEntityEvent event)
@@ -397,19 +380,6 @@ public class TeamSurvivalGames extends SurvivalGames
 			if (team == null)
 				return;
 			
-			String name = team.GetColor() + getColorName(team.GetColor());
-			
-			int i = 1;
-			for(GameTeam teams : GetTeamList())
-			{
-				if(teams.GetName().startsWith(name))
-				{
-					i++;
-				}
-			}
-			
-			team.setDisplayName(i + " " + name);
-			
 			//Join Team
 			SetPlayerTeam(player, team, true);
 			SetPlayerTeam(ally, team, true);			
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index e5799a30b..ce307ef95 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -185,13 +185,20 @@ public class GameLobbyManager implements Listener, IPacketHandler
 			{
 				for (GameTeam team : Manager.GetGame().GetTeamList())
 				{
-					if (rank == Rank.ALL)
+					if(team.GetDisplaytag())
 					{
-						scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(team.GetColor() + "");
+						scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(team.GetColor() + C.Bold + team.GetName() + ChatColor.RESET + team.GetColor() + " ");	
 					}
-					else
+					else 
 					{
-						scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(rank.GetTag(true, true) + ChatColor.RESET + " " + team.GetColor());
+						if (rank == Rank.ALL)
+						{
+							scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(team.GetColor() + "");
+						}
+						else
+						{
+							scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(rank.GetTag(true, true) + ChatColor.RESET + " " + team.GetColor());
+						}
 					}
 				}
 			}
@@ -507,7 +514,7 @@ public class GameLobbyManager implements Listener, IPacketHandler
 		}
 
 		//Smash
-		if (game.GetType() == GameType.Smash || game.GetType() == GameType.SurvivalGames)
+		if (game.ReplaceTeamsWithKits)
 		{
 //			WriteKitLine("Free", 0, 159, (byte)15);
 //			WriteKitLine("Kits", 1, 159, (byte)4);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
index 57524278e..0916ce725 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
@@ -124,7 +124,14 @@ public class GameScoreboard
 		for (GameTeam team : Game.GetTeamList())
 		{
 			System.out.println("Scoreboard Team: " + team.GetName().toUpperCase());
-			_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + "");	
+			if(team.GetDisplaytag())
+			{
+				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + C.Bold + team.GetName() + ChatColor.RESET + team.GetColor() + " ");
+			}
+			else
+			{
+				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + "");
+			}	
 		}
 		
 		/*

From c3742ec7948937fe0efd0cb100524fad04c91093 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 24 Jul 2015 15:00:49 +0200
Subject: [PATCH 040/113] Fixing the too long String bug.

---
 .../game/arcade/game/games/skywars/TeamSkywars.java       | 8 ++++----
 .../nautilus/game/arcade/managers/GameLobbyManager.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 91a8ce944..a97d87efc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -134,13 +134,13 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
-		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Custard", "Lemons"}),
+		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Leaves", "Grass"}),
 		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
-		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
+		RED(ChatColor.RED, new String[]{"Jam", "Lava", "Nether"}),
 		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
 		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
-		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"Spooky", "Lapis", "Tears"}),
 		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
 		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
 		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index ce307ef95..88f4201f9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -187,7 +187,7 @@ public class GameLobbyManager implements Listener, IPacketHandler
 				{
 					if(team.GetDisplaytag())
 					{
-						scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(team.GetColor() + C.Bold + team.GetName() + ChatColor.RESET + team.GetColor() + " ");	
+						scoreboard.registerNewTeam(rank.Name + team.GetName().toUpperCase()).setPrefix(team.GetColor() + C.Bold + team.GetName() + team.GetColor() + " ");	
 					}
 					else 
 					{

From a50455acf5b8d809b8fb7e2f6dfa69fdf8b61faf Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 24 Jul 2015 15:44:36 +0200
Subject: [PATCH 041/113] Fising last character bug.

---
 .../src/nautilus/game/arcade/scoreboard/GameScoreboard.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
index 0916ce725..bf6e1036c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
@@ -126,7 +126,7 @@ public class GameScoreboard
 			System.out.println("Scoreboard Team: " + team.GetName().toUpperCase());
 			if(team.GetDisplaytag())
 			{
-				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + C.Bold + team.GetName() + ChatColor.RESET + team.GetColor() + " ");
+				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + C.Bold + team.GetName() + team.GetColor() + " ");
 			}
 			else
 			{

From dcb6e0ec59745af3029e75f3109a6375c6d3af61 Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Fri, 24 Jul 2015 16:03:53 +0100
Subject: [PATCH 042/113] Added rejected games and whitelist to MPS.

---
 .../game/arcade/gui/privateServer/page/EditRotationPage.java  | 2 +-
 .../game/arcade/gui/privateServer/page/SetGamePage.java       | 2 +-
 .../src/nautilus/game/arcade/managers/GameHostManager.java    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index 9cc48a9ff..1e6ec81fb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -80,8 +80,8 @@ public class EditRotationPage extends BasePage
 		int gameSlot = 9;
 		for (GameType type : _manager.getAvailableGames(getPlayer()))
 		{
-			gameSlot++;
 			addGameButton(gameSlot, type, enabledGames.contains(type));
+			gameSlot++;
 		}
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 8c4cd9ae6..33f116fc2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -76,8 +76,8 @@ public class SetGamePage extends BasePage
 		int gameSlot = 9;
 		for (GameType type : _manager.getAvailableGames(getPlayer()))
 		{
-			gameSlot++;
 			addGameButton(gameSlot, type);
+			gameSlot++;
 		}
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index eedad1b34..e8eab9579 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -107,13 +107,15 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.OldMineWare);
 		legendGames.add(GameType.SmashDomination);
 		legendGames.add(GameType.Skywars);
-		// Team variants
+		// Team variants - Currently being remade.
+		/*
 		legendGames.add(GameType.DragonEscapeTeams);
 		legendGames.add(GameType.DragonsTeams);
 		legendGames.add(GameType.QuiverTeams);
 		legendGames.add(GameType.SmashTeams);
 		legendGames.add(GameType.SpleefTeams);
 		legendGames.add(GameType.SurvivalGamesTeams);
+		*/
 		//Rejected / Other
 		legendGames.add(GameType.Evolution);
 		legendGames.add(GameType.Gravity);

From 13fa6bca8b3f78fd3d84d6d195010c949b252639 Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Fri, 24 Jul 2015 16:24:17 +0100
Subject: [PATCH 043/113] Make it go back to game choose page.

---
 .../game/arcade/gui/privateServer/page/BasePage.java | 12 ++++++++++++
 .../arcade/gui/privateServer/page/ChooseMapPage.java |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
index f0bdac9d9..d3cd93fa3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
@@ -44,6 +44,18 @@ public abstract class BasePage extends ShopPageBase<ArcadeManager, PrivateServer
 		});
 	}
 
+	public void addBackToSetGamePage()
+	{
+		addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				
+			}
+		});
+	}
+
 	public ItemStack getPlayerHead(String playerName, String title)
 	{
 		return getPlayerHead(playerName, title, null);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
index 3e48034b7..39f4450cf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
@@ -36,7 +36,7 @@ public class ChooseMapPage extends BasePage
 		int slot = 9;
 		for (String cur : getPlugin().LoadFiles(_gameType.GetName())){
 			ChooseMapButton btn = new ChooseMapButton(getPlugin(), getShop(), _gameType, cur);
-			addButton(slot, new ShopItem(Material.MAP, cur.split(" ")[1], new String[]{"§7Click to select map."}, 1, false), btn);
+			addButton(slot, new ShopItem(Material.MAP, cur.split("_")[1], new String[]{"§7Click to select map."}, 1, false), btn);
 			slot++;
 		}
 	}

From 956d685549d47c1feecf05107f210f89dd9ddb2a Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Fri, 24 Jul 2015 20:24:21 +0100
Subject: [PATCH 044/113] Added MPS Game Voting.

---
 .../core/stats/command/TimeCommand.java       |   2 +-
 .../button/GameVotingButton.java              |  34 +++++
 .../gui/privateServer/page/BasePage.java      |   2 +-
 .../gui/privateServer/page/ChooseMapPage.java |   2 +-
 .../privateServer/page/GameVotingPage.java    | 143 ++++++++++++++++++
 .../gui/privateServer/page/MenuPage.java      |   8 +-
 .../game/arcade/managers/GameHostManager.java |  69 ++++++++-
 .../game/arcade/managers/GameManager.java     |   5 +-
 8 files changed, 253 insertions(+), 12 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GameVotingButton.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
index 321f7f14a..18d592581 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
@@ -71,7 +71,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 			else
 			{
 				int time = Plugin.Get(target).getStat("Global.TimeInGame");
-				UtilPlayer.message(caller, F.main("Time", F.name(target.getName() + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game")));
+				UtilPlayer.message(caller, F.main("Time", F.name(target.getName()) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
 			}
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GameVotingButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GameVotingButton.java
new file mode 100644
index 000000000..a3193d8f1
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/GameVotingButton.java
@@ -0,0 +1,34 @@
+package nautilus.game.arcade.gui.privateServer.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.GameVotingPage;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 24/07/15
+ */
+public class GameVotingButton implements IButton
+{
+	private ArcadeManager _arcadeManager;
+	private PrivateServerShop _shop;
+
+	public GameVotingButton(ArcadeManager arcadeManager, PrivateServerShop shop)
+	{
+		_shop = shop;
+		_arcadeManager = arcadeManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_shop.openPageForPlayer(player, new GameVotingPage(_arcadeManager, _shop, player));
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
index d3cd93fa3..fe3555ce8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BasePage.java
@@ -51,7 +51,7 @@ public abstract class BasePage extends ShopPageBase<ArcadeManager, PrivateServer
 			@Override
 			public void onClick(Player player, ClickType clickType)
 			{
-				
+				getShop().openPageForPlayer(player, new SetGamePage(getPlugin(), getShop(), player));
 			}
 		});
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
index 39f4450cf..864dd2078 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
@@ -31,7 +31,7 @@ public class ChooseMapPage extends BasePage
 	@Override
 	protected void buildPage()
 	{
-		addBackButton(4);
+		addBackToSetGamePage();
 
 		int slot = 9;
 		for (String cur : getPlugin().LoadFiles(_gameType.GetName())){
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
new file mode 100644
index 000000000..6343e9e33
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -0,0 +1,143 @@
+package nautilus.game.arcade.gui.privateServer.page;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.game.GameCategory;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 24/07/15
+ */
+public class GameVotingPage extends BasePage
+{
+	public GameVotingPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
+	{
+		super(plugin, shop, "Game Voting Menu", player, 54);
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		boolean host = getPlugin().GetGameHostManager().isHost(getPlayer());
+
+		if (host)
+		{
+			addBackButton(4);
+			addStartVoteButton(0);
+			addEndVoteButton(8);
+		}
+		else
+		{
+			addCloseButton(4);
+		}
+
+		ArrayList<GameCategory> allowedCats = new ArrayList<GameCategory>();
+		allowedCats.add(GameCategory.ARCADE);
+		allowedCats.add(GameCategory.CLASSICS);
+		allowedCats.add(GameCategory.SURVIVAL);
+		allowedCats.add(GameCategory.CHAMPIONS);
+		allowedCats.add(GameCategory.EXTRA);
+
+		int gameSlot = 9;
+		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		{
+			addGameButton(gameSlot, type);
+			gameSlot++;
+		}
+	}
+
+	private void addCloseButton(int slot)
+	{
+		ShopItem item = new ShopItem(Material.BED, (byte)0, "§c§lClose Menu", new String[]{}, 1, false, false);
+		addButton(slot, item, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				player.closeInventory();
+			}
+		});
+	}
+
+	private void addEndVoteButton(int slot)
+	{
+		ShopItem item = new ShopItem(Material.REDSTONE_BLOCK, (byte)0, "§c§lEnd Vote", new String[]{}, 1, false, false);
+		addButton(slot, item, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				if (!_manager.isHost(player)) //Double Check...
+					return;
+
+				getPlugin().GetGameHostManager().setVoteInProgress(false);
+				for (Player p : UtilServer.getPlayers())
+				{
+					UtilPlayer.message(p, F.main("Vote", "The vote has ended!"));
+				}
+				refresh();
+			}
+		});
+	}
+
+	private void addStartVoteButton(int slot)
+	{
+		String warning = "§c§lWARNING: §fThis will reset current votes!";
+		ShopItem item = new ShopItem(Material.EMERALD_BLOCK, (byte)0, "Start Vote", new String[]{warning}, 1, false, false);
+		addButton(slot, item, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				if (!_manager.isHost(player)) //Double Check...
+					return;
+
+				getPlugin().GetGameHostManager().setVoteInProgress(true);
+				getPlugin().GetGameHostManager().getVotes().clear();
+				for (Player p : UtilServer.getPlayers())
+				{
+					UtilPlayer.message(p, F.main("Vote", "A vote has started! Use " + F.skill("/vote") + " to vote."));
+				}
+				player.closeInventory();
+			}
+		});
+	}
+
+	private void addGameButton(int slot, final GameType type)
+	{
+		String click = "§7Click to vote for this Game Type";
+		int votes = 0;
+		for (GameType cur : getPlugin().GetGameHostManager().getVotes().values())
+		{
+			if (cur.equals(type))
+				votes++;
+		}
+		String curVotes = "§7Votes: §e" + votes;
+		ShopItem item = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{click, curVotes}, 1, false, false);
+		addButton(slot, item, new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				getPlugin().GetGameHostManager().getVotes().put(player.getName(), type);
+				refresh();
+			}
+		});
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
index 5afc072b6..615d8552b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
@@ -16,6 +16,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 import nautilus.game.arcade.gui.privateServer.button.BanButton;
 import nautilus.game.arcade.gui.privateServer.button.EditRotationButton;
+import nautilus.game.arcade.gui.privateServer.button.GameVotingButton;
 import nautilus.game.arcade.gui.privateServer.button.GiveAdminButton;
 import nautilus.game.arcade.gui.privateServer.button.KillButton;
 import nautilus.game.arcade.gui.privateServer.button.PlayerHeadButton;
@@ -30,7 +31,7 @@ public class MenuPage extends BasePage
 {
 	public MenuPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
-		super(plugin, shop, "Private Server Menu", player, 9*3);
+		super(plugin, shop, "Private Server Menu", player, 9*4);
 		buildPage();
 	}
 
@@ -93,8 +94,11 @@ public class MenuPage extends BasePage
 			addButton(4 + 18, new ShopItem(Material.GOLD_SWORD, "Remove Admin", new String[]{}, 1, false), removeAdminButton);
 
 			KillButton killButton = new KillButton(getPlugin());
-			addButton(8 + 18, new ShopItem(Material.TNT, "Kill Private Server",
+			addButton(4 + 27, new ShopItem(Material.TNT, "Kill Private Server",
 					new String[]{ChatColor.RESET + C.cGray + "Shift-Right Click to Kill Private Server"}, 1, false), killButton);
+
+			GameVotingButton votingButton = new GameVotingButton(getPlugin(), getShop());
+			addButton(8 + 18, new ShopItem(Material.BOOKSHELF, "Game Voting", new String[]{}, 1, false), votingButton);
 		}
 
 		OptionsButton optionsButton = new OptionsButton(getPlugin(), getShop());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index e8eab9579..cc53d89f9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -10,6 +10,7 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilTextBottom;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
@@ -18,6 +19,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.GameVotingPage;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -62,6 +64,10 @@ public class GameHostManager implements Listener
 	private boolean _isEventServer = false;
 	
 	private HashMap<Player, Boolean> _permissionMap = new HashMap<Player, Boolean>();
+
+	private boolean _voteInProgress = false;
+	private HashMap<String, GameType> _votes = new HashMap<String, GameType>();
+	private boolean _voteNotificationStage = false;
 	
 	public GameHostManager(ArcadeManager manager)
 	{
@@ -104,7 +110,6 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.SnowFight);
 		legendGames.add(GameType.Gravity);
 		legendGames.add(GameType.Barbarians);
-		legendGames.add(GameType.OldMineWare);
 		legendGames.add(GameType.SmashDomination);
 		legendGames.add(GameType.Skywars);
 		// Team variants - Currently being remade.
@@ -118,11 +123,9 @@ public class GameHostManager implements Listener
 		*/
 		//Rejected / Other
 		legendGames.add(GameType.Evolution);
-		legendGames.add(GameType.Gravity);
 		legendGames.add(GameType.MilkCow);
 		legendGames.add(GameType.SearchAndDestroy);
 		legendGames.add(GameType.SnowFight);
-		legendGames.add(GameType.WitherAssault);
 		legendGames.add(GameType.ZombieSurvival);
 
 		//Config Defaults
@@ -162,6 +165,27 @@ public class GameHostManager implements Listener
 		}
 	}
 
+	@EventHandler
+	public void voteNotification(UpdateEvent e)
+	{
+		if (e.getType() != UpdateType.FAST)
+			return;
+
+		if (!_voteInProgress)
+			return;
+
+		if (_voteNotificationStage)
+		{
+			_voteNotificationStage = false;
+			UtilTextBottom.display("§d§l> §5§lUSE §D§L/vote §5§lTO VOTE FOR A GAME §d§l<", UtilServer.getPlayers());
+		}
+		else
+		{
+			_voteNotificationStage = true;
+			UtilTextBottom.display("§5§l> §d§lUSE §5§L/vote §D§LTO VOTE FOR A GAME §5§l<", UtilServer.getPlayers());
+		}
+	}
+
 	@EventHandler
 	public void whitelistJoin(PlayerLoginEvent event)
 	{
@@ -317,19 +341,37 @@ public class GameHostManager implements Listener
 	{
 		return _adminList;
 	}
+
+	@EventHandler
+	public void voteCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (!event.getMessage().toLowerCase().startsWith("/vote"))
+			return;
+
+		if (!isPrivateServer())
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Vote", "This command is only available on private servers."));
+			event.setCancelled(true);
+			return;
+		}
+
+		event.setCancelled(true);
+		_shop.openPageForPlayer(event.getPlayer(), new GameVotingPage(Manager, _shop, event.getPlayer()));
+		return;
+	}
 	
 	@EventHandler
 	public void menuCommand(PlayerCommandPreprocessEvent event)
 	{
+		if (!event.getMessage().toLowerCase().startsWith("/menu"))
+			return;
+
 		if (!isPrivateServer())
 			return;
 		
 		if (!isAdmin(event.getPlayer(), true))
 			return;
 		
-		if (!event.getMessage().toLowerCase().startsWith("/menu"))
-			return;
-		
 		openMenu(event.getPlayer());
 	}
 	
@@ -670,4 +712,19 @@ public class GameHostManager implements Listener
 	{
 		_isEventServer = var;
 	}
+
+	public HashMap<String, GameType> getVotes()
+	{
+		return _votes;
+	}
+
+	public void setVoteInProgress(boolean voteInProgress)
+	{
+		_voteInProgress = voteInProgress;
+	}
+
+	public boolean isVoteInProgress()
+	{
+		return _voteInProgress;
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
index 119179fb8..cfed7e11b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
@@ -226,7 +226,10 @@ public class GameManager implements Listener
 	{
 		if (game instanceof UHC && !((UHC)game).isMapLoaded())
 			return;
-		
+
+		if (Manager.GetGameHostManager().isPrivateServer() && Manager.GetGameHostManager().isVoteInProgress())
+			return;
+
 		//Disabling Cosmetics
 		if (game.GetCountdown() <= 5 && game.GetCountdown() >= 0 && game.GadgetsDisabled)
 		{

From c1e5c2a9dc37f896aa7f145b3e362a95477ccd62 Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Fri, 24 Jul 2015 21:15:19 +0100
Subject: [PATCH 045/113] MPS changed requested by <insert meow here>.

---
 .../game/arcade/gui/privateServer/page/ChooseMapPage.java   | 2 +-
 .../arcade/gui/privateServer/page/EditRotationPage.java     | 2 +-
 .../game/arcade/gui/privateServer/page/GameVotingPage.java  | 4 ++--
 .../game/arcade/gui/privateServer/page/SetGamePage.java     | 6 +++---
 .../src/nautilus/game/arcade/managers/GameHostManager.java  | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
index 864dd2078..88914ff5d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java
@@ -36,7 +36,7 @@ public class ChooseMapPage extends BasePage
 		int slot = 9;
 		for (String cur : getPlugin().LoadFiles(_gameType.GetName())){
 			ChooseMapButton btn = new ChooseMapButton(getPlugin(), getShop(), _gameType, cur);
-			addButton(slot, new ShopItem(Material.MAP, cur.split("_")[1], new String[]{"§7Click to select map."}, 1, false), btn);
+			addButton(slot, new ShopItem(Material.PAPER, cur.split("_")[1], new String[]{"§7Click to select map."}, 1, false), btn);
 			slot++;
 		}
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index 1e6ec81fb..e2d391a1f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -87,7 +87,7 @@ public class EditRotationPage extends BasePage
 
 	private void addGameButton(int slot, final GameType type, boolean enabled)
 	{
-		String titleString = ChatColor.RESET + (enabled ? C.cGreen : C.cRed) + ChatColor.BOLD + type.GetLobbyName();
+		String titleString = ChatColor.RESET + (enabled ? C.cGreen : C.cRed) + ChatColor.BOLD + type.GetName();
 		String infoString = ChatColor.RESET + C.cGray + (enabled ? "Click to Disable" : "Click to Enable");
 		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), titleString, new String[]{infoString}, 1, false, false);
 		int itemCount = enabled ? 1 : 0;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index 6343e9e33..184741f1e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -129,14 +129,14 @@ public class GameVotingPage extends BasePage
 				votes++;
 		}
 		String curVotes = "§7Votes: §e" + votes;
-		ShopItem item = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{click, curVotes}, 1, false, false);
+		ShopItem item = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), new String[]{click, curVotes}, 1, false, false);
 		addButton(slot, item, new IButton()
 		{
 			@Override
 			public void onClick(Player player, ClickType clickType)
 			{
 				getPlugin().GetGameHostManager().getVotes().put(player.getName(), type);
-				refresh();
+				player.closeInventory();
 			}
 		});
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 33f116fc2..776717238 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -85,9 +85,9 @@ public class SetGamePage extends BasePage
 	{
 		String infoString = ChatColor.RESET + C.cGray + "Make this next Game Type";
 		String space = "§1";
-		String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §drandom map§7.";
-		String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §6choose map§7.";
-		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetLobbyName(), new String[]{infoString, space, left, right}, 1, false, false);
+		String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §fRandom Map§7.";
+		String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §fChoose Map§7.";
+		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), new String[]{infoString, space, left, right}, 1, false, false);
 		addButton(slot, shopItem, new IButton()
 		{
 			@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index cc53d89f9..eedf5dd62 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -125,7 +125,6 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.Evolution);
 		legendGames.add(GameType.MilkCow);
 		legendGames.add(GameType.SearchAndDestroy);
-		legendGames.add(GameType.SnowFight);
 		legendGames.add(GameType.ZombieSurvival);
 
 		//Config Defaults

From 91d0a37d772defa590f942881f41541c770d8e9c Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Sat, 25 Jul 2015 12:48:39 +0100
Subject: [PATCH 046/113] Animation change etc.

---
 .../privateServer/page/GameVotingPage.java    | 33 ++++++++++++-----
 .../game/arcade/managers/GameHostManager.java | 36 ++++++++++++++-----
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index 184741f1e..0de679829 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -114,7 +114,7 @@ public class GameVotingPage extends BasePage
 				{
 					UtilPlayer.message(p, F.main("Vote", "A vote has started! Use " + F.skill("/vote") + " to vote."));
 				}
-				player.closeInventory();
+				refresh();
 			}
 		});
 	}
@@ -130,14 +130,31 @@ public class GameVotingPage extends BasePage
 		}
 		String curVotes = "§7Votes: §e" + votes;
 		ShopItem item = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), new String[]{click, curVotes}, 1, false, false);
-		addButton(slot, item, new IButton()
+		if (votes >= 1)
 		{
-			@Override
-			public void onClick(Player player, ClickType clickType)
+			addButton(slot, item, new IButton()
 			{
-				getPlugin().GetGameHostManager().getVotes().put(player.getName(), type);
-				player.closeInventory();
-			}
-		});
+				@Override
+				public void onClick(Player player, ClickType clickType)
+				{
+					getPlugin().GetGameHostManager().getVotes().put(player.getName(), type);
+					refresh();
+				}
+			});
+			return;
+		}
+		else
+		{
+			addButtonFakeCount(slot, item, new IButton()
+			{
+				@Override
+				public void onClick(Player player, ClickType clickType)
+				{
+					getPlugin().GetGameHostManager().getVotes().put(player.getName(), type);
+					refresh();
+				}
+			}, votes);
+			return;
+		}
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index eedf5dd62..f9f0ea08a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -67,7 +67,7 @@ public class GameHostManager implements Listener
 
 	private boolean _voteInProgress = false;
 	private HashMap<String, GameType> _votes = new HashMap<String, GameType>();
-	private boolean _voteNotificationStage = false;
+	private int _voteNotificationStage = 1;
 	
 	public GameHostManager(ArcadeManager manager)
 	{
@@ -167,21 +167,41 @@ public class GameHostManager implements Listener
 	@EventHandler
 	public void voteNotification(UpdateEvent e)
 	{
-		if (e.getType() != UpdateType.FAST)
+		if (e.getType() != UpdateType.FASTER)
 			return;
 
 		if (!_voteInProgress)
 			return;
 
-		if (_voteNotificationStage)
+		if (_voteNotificationStage == 1)
 		{
-			_voteNotificationStage = false;
-			UtilTextBottom.display("§d§l> §5§lUSE §D§L/vote §5§lTO VOTE FOR A GAME §d§l<", UtilServer.getPlayers());
+			UtilTextBottom.display("§e§l> §6§lUse §e§l/vote §6§lto vote for a game! §e§l<", UtilServer.getPlayers());
+			_voteNotificationStage++;
+			return;
 		}
-		else
+		else if (_voteNotificationStage == 2)
 		{
-			_voteNotificationStage = true;
-			UtilTextBottom.display("§5§l> §d§lUSE §5§L/vote §D§LTO VOTE FOR A GAME §5§l<", UtilServer.getPlayers());
+			UtilTextBottom.display("§a§l> §2§lUse §a§l/vote §2§lto vote for a game! §a§l<", UtilServer.getPlayers());
+			_voteNotificationStage++;
+			return;
+		}
+		else if (_voteNotificationStage == 3)
+		{
+			UtilTextBottom.display("§c§l> §4§lUse §c§l/vote §4§lto vote for a game! §c§l<", UtilServer.getPlayers());
+			_voteNotificationStage++;
+			return;
+		}
+		else if (_voteNotificationStage == 4)
+		{
+			UtilTextBottom.display("§b§l> §3§lUse §b§l/vote §3§lto vote for a game! §b§l<", UtilServer.getPlayers());
+			_voteNotificationStage++;
+			return;
+		}
+		else if (_voteNotificationStage == 5)
+		{
+			UtilTextBottom.display("§d§l> §5§lUse §d§l/vote §5§lto vote for a game! §d§l<", UtilServer.getPlayers());
+			_voteNotificationStage = 1;
+			return;
 		}
 	}
 

From cf61b50d9878485b5b3aca91627abf9ed1ad4601 Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Sat, 25 Jul 2015 17:35:43 +0100
Subject: [PATCH 047/113] More changes.

---
 .../src/mineplex/core/achievement/AchievementCategory.java | 6 +++++-
 .../game/arcade/gui/privateServer/page/GameVotingPage.java | 2 ++
 .../src/nautilus/game/arcade/managers/GameHostManager.java | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
index 676d45c0c..df3410ee2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
@@ -118,7 +118,11 @@ public enum AchievementCategory
 	
 	MICRO_BATTLE("Micro Battle", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.LAVA, 0, GameCategory.ARCADE, null);
+			Material.LAVA, 0, GameCategory.ARCADE, null),
+
+	BOMB_LOBBERS("Bomb Lobbers", null,
+						 new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+	Material.FIREBALL, 0, GameCategory.ARCADE, "Waller Kit");
 	
 
 	private String _name;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index 0de679829..fa645a7e4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -3,6 +3,7 @@ package nautilus.game.arcade.gui.privateServer.page;
 import java.util.ArrayList;
 
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
@@ -113,6 +114,7 @@ public class GameVotingPage extends BasePage
 				for (Player p : UtilServer.getPlayers())
 				{
 					UtilPlayer.message(p, F.main("Vote", "A vote has started! Use " + F.skill("/vote") + " to vote."));
+					p.playSound(p.getLocation(), Sound.NOTE_BASS, 1F, 1F);
 				}
 				refresh();
 			}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index f9f0ea08a..77deb6fa7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -374,6 +374,13 @@ public class GameHostManager implements Listener
 			return;
 		}
 
+		if (!_voteInProgress)
+		{
+			UtilPlayer.message(event.getPlayer(), F.main("Vote", "There is no vote in progress."));
+			event.setCancelled(true);
+			return;
+		}
+
 		event.setCancelled(true);
 		_shop.openPageForPlayer(event.getPlayer(), new GameVotingPage(Manager, _shop, event.getPlayer()));
 		return;

From 0fd59e9fdb8b664a3aeb23c53626de584ae749b7 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 21:50:37 -0400
Subject: [PATCH 048/113] Added an achievement, removed team one, touched up
 another. Swag.

---
 .../core/achievement/Achievement.java         | 26 ++++------
 .../game/games/lobbers/BombLobbers.java       |  7 ++-
 .../games/lobbers/trackers/Tracker6Kill.java  |  1 -
 .../lobbers/trackers/TrackerBestTeam.java     | 51 -------------------
 .../lobbers/trackers/TrackerDirectHit.java    | 34 +++++++++++++
 .../lobbers/trackers/TrackerNoDamage.java     | 32 ++++--------
 .../lobbers/trackers/TrackerTNTThrown.java    |  1 -
 7 files changed, 55 insertions(+), 97 deletions(-)
 delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index a058b7496..eba3a292a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -643,39 +643,31 @@ public enum Achievement
 			new String[]{"Throw 2000 TNT"},
 			new int[]{2000},
 			AchievementCategory.BOMB_LOBBERS),
-			
-//	BOMB_LOBBERS_REKT_X3("Rekt x3", 800, 
-//			new String[]{"Bomb Lobbers.3Kill"},
-//			new String[]{"Kill 3 players with one explosion"},
-//			new int[]{1},
-//			AchievementCategory.BOMB_LOBBERS),
-			
+
 	BOMB_LOBBERS_ULTIMATE_KILLER("Ultimate Killer", 800,
 			new String[]{"Bomb Lobbers.Killer"},
 			new String[]{"Kill 6 players in a single game"},
 			new int[]{1},
 			AchievementCategory.BOMB_LOBBERS),
 			
-	BOMB_LOBBERS_EXPLOSION_PROOF("Jelly Skin", 1000, 
+	BOMB_LOBBERS_EXPLOSION_PROOF("Jelly Skin", 1200, 
 			new String[]{"Bomb Lobbers.JellySkin"},
 			new String[]{"Win a game without taking any damage."},
 			new int[]{1},
 			AchievementCategory.BOMB_LOBBERS),
 			
-	BOMB_LOBBERS_BEST_TEAM("The Best Team", 800,
-			new String[]{"Bomb Lobbers.BestTeam"},
-			new String[]{"Win a game without losing a teammate"},
-			new int[]{1},
-			AchievementCategory.BOMB_LOBBERS),
-			
 	BOMB_LOBBERS_BLAST_PROOF("Blast Proof", 800,
 			new String[]{"Bomb Lobbers.BlastProof"},
 			new String[]{"Win 20 games using Armorer"},
 			new int[]{20},
-			AchievementCategory.BOMB_LOBBERS)
-	
+			AchievementCategory.BOMB_LOBBERS),
+			
+	BOMB_LOBBERS_SNIPER("Sniper", 10000,
+			new String[]{"Bomb Lobbers.Direct Hit"},
+			new String[]{"Get 50 direct hits"},
+			new int[]{50},
+			AchievementCategory.BOMB_LOBBERS)
 			
-//	BOMB_LOBBERS_
 	;
 
 	private String _name;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index 51190eed7..852611a4b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -33,12 +33,12 @@ import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.games.lobbers.events.TNTPreExplodeEvent;
 import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
 import nautilus.game.arcade.game.games.lobbers.kits.KitArmorer;
-import nautilus.game.arcade.game.games.lobbers.kits.KitPitcher;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
+import nautilus.game.arcade.game.games.lobbers.kits.KitPitcher;
 import nautilus.game.arcade.game.games.lobbers.kits.KitWaller;
 import nautilus.game.arcade.game.games.lobbers.trackers.Tracker6Kill;
-import nautilus.game.arcade.game.games.lobbers.trackers.TrackerBestTeam;
 import nautilus.game.arcade.game.games.lobbers.trackers.TrackerBlastProof;
+import nautilus.game.arcade.game.games.lobbers.trackers.TrackerDirectHit;
 import nautilus.game.arcade.game.games.lobbers.trackers.TrackerNoDamage;
 import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
 import nautilus.game.arcade.kit.Kit;
@@ -79,7 +79,6 @@ public class BombLobbers extends TeamGame implements IThrown
 				new KitJumper(manager),
 				new KitArmorer(manager),
 				new KitPitcher(manager),
-//				new KitMortar(manager), << Spare time kit for Bobbeh
 				new KitWaller(manager)
 				}, new String[]
 						{
@@ -109,7 +108,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 		HungerSet = 20;
 		
-		registerStatTrackers(new Tracker6Kill(this), new TrackerBestTeam(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this));
+		registerStatTrackers(new Tracker6Kill(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this), new TrackerDirectHit(this));
 	}
 	
 	public void addKill(Player player)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java
index ee8bc27f5..571da0f45 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java
@@ -12,7 +12,6 @@ import org.bukkit.event.EventHandler;
 
 public class Tracker6Kill extends StatTracker<Game>
 {
-	
 	public Tracker6Kill(Game game)
 	{
 		super(game);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java
deleted file mode 100644
index fb37cc3ae..000000000
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package nautilus.game.arcade.game.games.lobbers.trackers;
-
-import mineplex.core.common.util.NautHashMap;
-import nautilus.game.arcade.events.GameStateChangeEvent;
-import nautilus.game.arcade.game.Game;
-import nautilus.game.arcade.game.Game.GameState;
-import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.stats.StatTracker;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
-public class TrackerBestTeam extends StatTracker<Game>
-{
-	private NautHashMap<GameTeam, Integer> _teams = new NautHashMap<GameTeam, Integer>();
-	
-	public TrackerBestTeam(Game game)
-	{
-		super(game);
-	}
-	
-	@EventHandler
-	public void onGameStart(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Prepare)
-			return;
-		
-		for (GameTeam team : getGame().GetTeamList())
-		{
-			_teams.put(team, team.GetPlayers(true).size());
-		}
-	}
-	
-	@EventHandler
-	public void onGameEnd(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.End)
-			return;
-		
-		for (GameTeam team : getGame().GetTeamList())
-		{
-			if (_teams.get(team) == team.GetPlayers(true).size())
-			{
-				for (Player player : team.GetPlayers(true))
-				{
-					addStat(player, "BestTeam", 1, true, false);
-				}
-			}
-		}
-	}
-}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java
new file mode 100644
index 000000000..208a16526
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java
@@ -0,0 +1,34 @@
+package nautilus.game.arcade.game.games.lobbers.trackers;
+
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.stats.StatTracker;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class TrackerDirectHit extends StatTracker<Game>
+{
+	public TrackerDirectHit(Game game)
+	{
+		super(game);
+	}
+
+	@EventHandler
+	public void onKillDirectHit(CustomDamageEvent event)
+	{
+		if (!getGame().IsLive())
+			return;
+		
+		if (event.GetDamagerPlayer(true) == null)
+			return;
+		
+		Player damager = event.GetDamagerPlayer(true);
+		
+		if (!getGame().IsAlive(damager))
+			return;
+			
+		if (event.GetReason().toLowerCase().contains("direct hit"))
+			addStat(damager, "Direct Hit", 1, false, false);
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java
index 7ad9f8550..4fd51143e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java
@@ -3,7 +3,6 @@ package nautilus.game.arcade.game.games.lobbers.trackers;
 import java.util.HashSet;
 import java.util.Set;
 
-import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
@@ -16,36 +15,25 @@ import org.bukkit.event.EventPriority;
 
 public class TrackerNoDamage extends StatTracker<Game>
 {
-	private Set<String> _noDamage = new HashSet<String>();
+	private Set<String> _damaged = new HashSet<String>();
 	
 	public TrackerNoDamage(Game game)
 	{
 		super(game);
 	}
 	
-	@EventHandler
-	public void onGameStart(GameStateChangeEvent event)
-	{
-		if (event.GetState() != GameState.Prepare)
-			return;
-		
-		for (Player player : getGame().GetPlayers(true))
-		{
-			_noDamage.add(player.getName());
-		}
-	}
-	
 	@EventHandler
 	public void onGameEnd(GameStateChangeEvent event)
 	{
 		if (event.GetState() != GameState.End)
 			return;
 		
-		for (String name : _noDamage)
+		if (event.GetGame().getWinners() == null)
+			return;
+		
+		for (Player player : event.GetGame().getWinners())
 		{
-			Player player = UtilPlayer.searchExact(name);
-			
-			if (player == null || !player.isOnline())
+			if (_damaged.contains(player.getName()))
 				continue;
 			
 			addStat(player, "JellySkin", 1, true, false);
@@ -61,9 +49,7 @@ public class TrackerNoDamage extends StatTracker<Game>
 		if (event.GetDamageePlayer() == null || !event.GetDamageePlayer().isOnline())
 			return;
 		
-		if (_noDamage.contains(event.GetDamageePlayer().getName()))
-		{
-			_noDamage.remove(event.GetDamageePlayer().getName());
-		}
+		if (!_damaged.contains(event.GetDamageePlayer().getName()))
+			_damaged.add(event.GetDamageePlayer().getName());
 	}
-}
+}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java
index 0aa2d93e6..e8d7993c3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java
@@ -22,5 +22,4 @@ public class TrackerTNTThrown extends StatTracker<Game>
 	
 		addStat(event.getPlayer(), "Thrown", 1, false, false);
 	}
-
 }

From 4ceb156e691e430f3ee15e1b46254d9ec12bdcc4 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 23:44:55 -0400
Subject: [PATCH 049/113] Various improvements.

---
 .../arcade/game/games/lobbers/BombLobbers.java   | 16 +++++++++++++---
 .../games/lobbers/trackers/TrackerDirectHit.java |  6 +++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index 852611a4b..df3d97f48 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -108,6 +108,8 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 		HungerSet = 20;
 		
+		WorldTimeSet = -1;
+		
 		registerStatTrackers(new Tracker6Kill(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this), new TrackerDirectHit(this));
 	}
 	
@@ -294,6 +296,8 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (!IsLive())
 			return;
 		
+		NautHashMap<TNTPrimed, BombToken> toAdd = new NautHashMap<TNTPrimed, BombToken>();
+		
 		Iterator<Entry<TNTPrimed, BombToken>> iterator = _tnt.entrySet().iterator();
 		while (iterator.hasNext())
 		{
@@ -329,10 +333,16 @@ public class BombLobbers extends TeamGame implements IThrown
 					tnt.getKey().remove();
 					
 					iterator.remove();
-					_tnt.put(newTNT, token);
+					toAdd.put(newTNT, token);
 				}
 			}
 		}
+		
+		//Prevent concurrent modification thigns
+		for (Entry<TNTPrimed, BombToken> entry : toAdd.entrySet())
+		{
+			_tnt.put(entry.getKey(), entry.getValue());
+		}
 	}
 	
 	@EventHandler
@@ -442,13 +452,13 @@ public class BombLobbers extends TeamGame implements IThrown
 				
 				if (team.GetColor() == ChatColor.AQUA)
 				{
-					for (int i = 0 ; i < 5 ; i++)
+					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), -1, 1, 1, 1, 0,
 								ViewDist.NORMAL, UtilServer.getPlayers());
 				}
 				else
 				{
-					for (int i = 0 ; i < 5 ; i++)
+					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), 0, 0, 0, 0, 1,
 								ViewDist.NORMAL, UtilServer.getPlayers());
 				}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java
index 208a16526..82bfe2120 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerDirectHit.java
@@ -6,6 +6,7 @@ import nautilus.game.arcade.stats.StatTracker;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 
 public class TrackerDirectHit extends StatTracker<Game>
 {
@@ -14,7 +15,7 @@ public class TrackerDirectHit extends StatTracker<Game>
 		super(game);
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onKillDirectHit(CustomDamageEvent event)
 	{
 		if (!getGame().IsLive())
@@ -28,6 +29,9 @@ public class TrackerDirectHit extends StatTracker<Game>
 		if (!getGame().IsAlive(damager))
 			return;
 			
+		if (event.GetReason() == null)
+			return;
+		
 		if (event.GetReason().toLowerCase().contains("direct hit"))
 			addStat(damager, "Direct Hit", 1, false, false);
 	}

From 0586e5fb77f5d6d757c393276fed51775ebe7dd8 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sun, 26 Jul 2015 00:27:09 -0400
Subject: [PATCH 050/113] Added an exception for a map to make it night.

---
 .../arcade/game/games/lobbers/BombLobbers.java     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index df3d97f48..837104e2d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -108,11 +108,23 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 		HungerSet = 20;
 		
-		WorldTimeSet = -1;
+		WorldTimeSet = 6000;
 		
 		registerStatTrackers(new Tracker6Kill(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this), new TrackerDirectHit(this));
 	}
 	
+	@EventHandler
+	public void setTime(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Prepare)
+			return;
+		
+		if (WorldData.MapName.equalsIgnoreCase("Intergalactic"))
+		{
+			WorldTimeSet = 18000;
+		}
+	}
+	
 	public void addKill(Player player)
 	{
 		_kills.put(player, _kills.containsKey(player) ? _kills.get(player) + 1 : 1);

From 02f1211ddb7688737dc66605c174167cce708d0e Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Sun, 26 Jul 2015 18:12:56 -0700
Subject: [PATCH 051/113] Misc

---
 .../src/mineplex/core/achievement/AchievementManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
index 582bded1a..f2a63704c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
@@ -210,7 +210,7 @@ public class AchievementManager extends MiniPlugin
 
 		if (sender.getName().equalsIgnoreCase("Phinary") || sender.getName().equalsIgnoreCase("Horus"))
 			level = -level;
-		else if (sender.getName().equalsIgnoreCase("B2_mp") || sender.getName().equalsIgnoreCase("Horus"))
+		else if (sender.getName().equalsIgnoreCase("B2_mp"))
 			return 101;
 		else if (rank.Has(Rank.OWNER))
 			level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());

From 0b53bca385c7389ee0be792a5019d82345ddc6d0 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Sun, 26 Jul 2015 18:58:35 -0700
Subject: [PATCH 052/113] Needed permission changes for Jr Developers (Pending
 approval)

---
 .../src/mineplex/core/common/Rank.java               |  8 ++++----
 .../mineplex/core/account/command/UpdateRank.java    | 12 ++++++++++--
 .../src/mineplex/core/npc/command/AddCommand.java    |  2 +-
 .../src/mineplex/core/npc/command/DeleteCommand.java |  2 +-
 .../src/mineplex/core/npc/command/HomeCommand.java   |  2 +-
 .../src/mineplex/core/npc/command/NpcCommand.java    |  2 +-
 .../mineplex/core/portal/Commands/SendCommand.java   |  2 +-
 .../core/preferences/ui/PreferencesPage.java         |  2 +-
 .../mineplex/core/teleport/command/HereCommand.java  |  2 +-
 .../Mineplex.Hub/src/mineplex/hub/HubManager.java    |  7 +++++--
 .../src/mineplex/hub/commands/GadgetToggle.java      |  2 +-
 .../src/mineplex/hub/commands/GameModeCommand.java   |  2 +-
 .../src/mineplex/hub/modules/ForcefieldManager.java  |  4 ++--
 .../src/nautilus/game/arcade/ArcadeManager.java      | 12 ++++++++++++
 .../game/arcade/command/DisguiseCommand.java         |  6 +++---
 .../nautilus/game/arcade/command/WriteCommand.java   |  2 +-
 16 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
index 1c769e523..f0a1f16fc 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
@@ -1,20 +1,20 @@
 package mineplex.core.common;
 
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilPlayer;
-
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilPlayer;
+
 public enum Rank
 {
 	LT("LT", ChatColor.DARK_RED),
 	OWNER("Owner", ChatColor.DARK_RED),
 	DEVELOPER("Dev", ChatColor.RED),
 	ADMIN("Admin", ChatColor.RED),
+	JNR_DEV("Jr.Dev", ChatColor.RED),
 	SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
 	MODERATOR("Mod", ChatColor.GOLD),
-	JNR_DEV("Jr.Dev", ChatColor.RED),
 	HELPER("Trainee", ChatColor.DARK_AQUA),
 	MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
 	MAPDEV("Builder", ChatColor.BLUE),
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
index 8a7efe8fe..4a408a958 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
@@ -19,12 +19,20 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 {
 	public UpdateRank(CoreClientManager plugin)
 	{
-		super(plugin, Rank.ADMIN, "updateRank");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV /*On test servers only*/}, "updateRank");
 	}
 
 	@Override
 	public void Execute(final Player caller, String[] args)
 	{
+		boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
+
+		if (Plugin.Get(caller).GetRank() == Rank.JNR_DEV && !testServer)
+		{
+			F.main(Plugin.getName(), F.elem(Rank.JNR_DEV.GetTag(true, true)) + "s are only permitted to set ranks on test servers!");
+			return;
+		}
+
 		if (args == null)
 		{			
 			UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR"));
@@ -52,7 +60,7 @@ 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.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR)
+			if (!testServer && (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR))
 			{
 				if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT))
 				{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
index 08beeb4fe..c03d5e8d0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
@@ -13,7 +13,7 @@ public class AddCommand extends CommandBase<NpcManager>
 {
 	public AddCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "add");
+		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "add");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
index 4b7ab183b..f6ec70ca5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
@@ -12,7 +12,7 @@ public class DeleteCommand extends CommandBase<NpcManager>
 {
 	public DeleteCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "del");
+		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "del");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java
index 957816f12..03382bf95 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java
@@ -12,7 +12,7 @@ public class HomeCommand extends CommandBase<NpcManager>
 {
 	public HomeCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "home");
+		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "home");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
index 3e3037964..5e66eee21 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
@@ -10,7 +10,7 @@ public class NpcCommand extends MultiCommandBase<NpcManager>
 {
 	public NpcCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, "npc");
+		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "npc");
 
 		AddCommand(new AddCommand(plugin));
 		AddCommand(new DeleteCommand(plugin));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java
index 3e447d5ae..e35d2f15e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java
@@ -14,7 +14,7 @@ public class SendCommand extends CommandBase<Portal>
 {
 	public SendCommand(Portal plugin)
 	{
-		super(plugin, Rank.ADMIN, "send");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "send");
 	}
 	
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
index f293eaf8d..31e1bb563 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
@@ -261,7 +261,7 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
 			buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
 			buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
 		}
-		if (getClientManager().Get(getPlayer()).GetRank().Has(Rank.ADMIN))
+		if (getClientManager().Get(getPlayer()).GetRank().Has(Rank.ADMIN) || getClientManager().Get(getPlayer()).GetRank() == Rank.JNR_DEV)
 		{
 			buildPreference(36, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
 			buildPreference(38, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/HereCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/HereCommand.java
index a2371ce9a..264695e3a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/HereCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/command/HereCommand.java
@@ -10,7 +10,7 @@ public class HereCommand extends CommandBase<Teleport>
 {
 	public HereCommand(Teleport plugin)
 	{
-		super(plugin, Rank.ADMIN, "here", "h"); 
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "here", "h");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index dcaac1d40..2cf2e5b53 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -103,7 +103,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 public class HubManager extends MiniClientPlugin<HubClient>
 {
 	// ☃❅ Snowman!
-	public HubType Type = HubType.Normal; 
+	public HubType Type = HubType.Normal;
   
 	private BlockRestore _blockRestore;
 	private CoreClientManager _clientManager;
@@ -495,7 +495,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
 	@EventHandler(priority = EventPriority.LOW)
 	public void AdminOP(PlayerJoinEvent event)
 	{
-		if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER))
+		// Give developers operator on their servers
+		boolean testServer = _plugin.getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
+
+		if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER) || (testServer && (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.DEVELOPER) || _clientManager.Get(event.getPlayer()).GetRank() == Rank.JNR_DEV)))
 			event.getPlayer().setOp(true);
 		else
 			event.getPlayer().setOp(false);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GadgetToggle.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GadgetToggle.java
index 810e964d8..2d99ce5d7 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GadgetToggle.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GadgetToggle.java
@@ -10,7 +10,7 @@ public class GadgetToggle extends CommandBase<HubManager>
 {
 	public GadgetToggle(HubManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new String[] {"gadget"});
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, new String[] {"gadget"});
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GameModeCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GameModeCommand.java
index 7900e79ee..4416e7b15 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GameModeCommand.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/GameModeCommand.java
@@ -13,7 +13,7 @@ public class GameModeCommand extends CommandBase<HubManager>
 {
 	public GameModeCommand(HubManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new String[] {"gm"});
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, new String[] {"gm"});
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
index 425ce1a0f..07caf2363 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
@@ -42,7 +42,7 @@ public class ForcefieldManager extends MiniPlugin
 
 		for (Player player : UtilServer.getPlayers())
 		{
-			if (Manager.getPreferences().Get(player).HubForcefield && Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN))
+			if (Manager.getPreferences().Get(player).HubForcefield && (Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN) || Manager.GetClients().Get(player).GetRank() == Rank.JNR_DEV))
 			{
 				for (Player other : UtilServer.getPlayers())
 				{
@@ -56,7 +56,7 @@ public class ForcefieldManager extends MiniPlugin
 					if (UtilMath.offset(other, player) > range)
 						continue;
 
-					if (Manager.GetClients().Get(other).GetRank().Has(Rank.ADMIN))
+					if (Manager.GetClients().Get(other).GetRank().Has(Rank.ADMIN) || Manager.GetClients().Get(other).GetRank() == Rank.JNR_DEV)
 						continue;
 
 					if (Recharge.Instance.use(other, "Forcefield Bump", 500, false, false))
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 59bb9719d..35316582d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -829,6 +829,18 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		}
 	}
 
+	@EventHandler(priority = EventPriority.LOW)
+	public void AdminOP(PlayerJoinEvent event)
+	{
+		// Give developers operator on their servers
+		boolean testServer = _plugin.getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
+
+		if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER) || (testServer && (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.DEVELOPER) || _clientManager.Get(event.getPlayer()).GetRank() == Rank.JNR_DEV)))
+			event.getPlayer().setOp(true);
+		else
+			event.getPlayer().setOp(false);
+	}
+
 	public boolean IsAlive(Player player)
 	{
 		if (_game == null)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
index 8e1e5dc51..f45344d2a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
@@ -3,9 +3,8 @@ package nautilus.game.arcade.command;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
-
-import nautilus.game.arcade.ArcadeManager;
 import net.minecraft.util.com.mojang.authlib.GameProfile;
+
 import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
@@ -13,12 +12,13 @@ import mineplex.core.common.util.ProfileLoader;
 import mineplex.core.common.util.UUIDFetcher;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.disguise.disguises.DisguisePlayer;
+import nautilus.game.arcade.ArcadeManager;
 
 public class DisguiseCommand extends CommandBase<ArcadeManager>
 {
 	public DisguiseCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "disguise");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH, Rank.JNR_DEV}, "disguise");
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/WriteCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/WriteCommand.java
index 1718baec5..386d3867d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/WriteCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/WriteCommand.java
@@ -11,7 +11,7 @@ public class WriteCommand extends CommandBase<ArcadeManager>
 {
 	public WriteCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.ADMIN, "write");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "write");
 	}
 
 	@Override

From 7d9fd61c8ead297e889ee1ad60331353d7e8751a Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Sun, 26 Jul 2015 22:31:40 -0700
Subject: [PATCH 053/113] Display changes

---
 .../core/account/command/UpdateRank.java      |  4 +--
 .../core/achievement/AchievementManager.java  | 26 ++++++++++---------
 .../mineplex/core/punish/UI/PunishPage.java   | 15 +++++++++++
 .../core/updater/RestartServerCommand.java    |  2 +-
 .../mineplex/hub/commands/NewsCommand.java    |  2 +-
 .../hub/commands/NewsListCommand.java         |  2 +-
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
index 4a408a958..21f0ee4c9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
@@ -60,9 +60,9 @@ public class UpdateRank extends CommandBase<CoreClientManager>
 			
 			final Rank rank = tempRank;
 			 
-			if (!testServer && (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR))
+			if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR || rank == Rank.JNR_DEV || rank == Rank.DEVELOPER)
 			{
-				if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT))
+				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;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
index f2a63704c..70348c191 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
@@ -208,20 +208,22 @@ public class AchievementManager extends MiniPlugin
 	{
 		int level = get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel();
 
+		if (sender.getName().equalsIgnoreCase("B2_mp"))
+			return 101;
+
+		if (rank.Has(Rank.MODERATOR))
+			level = Math.max(level, 5);
+		if (rank.Has(Rank.SNR_MODERATOR))
+			level = Math.max(level, 15);
+		if (rank.Has(Rank.JNR_DEV))
+			level = Math.max(level, 25);
+		if (rank.Has(Rank.ADMIN))
+			level = Math.max(level, 30 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
+		if (rank.Has(Rank.OWNER))
+			level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
+
 		if (sender.getName().equalsIgnoreCase("Phinary") || sender.getName().equalsIgnoreCase("Horus"))
 			level = -level;
-		else if (sender.getName().equalsIgnoreCase("B2_mp"))
-			return 101;
-		else if (rank.Has(Rank.OWNER))
-			level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
-		else if	(rank.Has(Rank.ADMIN))
-			level = Math.max(level, 30 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
-		else if	(rank.Has(Rank.SNR_MODERATOR))
-			level = Math.max(level, 15);
-		else if	(rank.Has(Rank.MODERATOR))
-			level = Math.max(level, 5);
-		else if (rank.Has(Rank.JNR_DEV))
-			level = Math.max(level, 25);
 		
 		return level;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
index ff2949dd6..b2a8768aa 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
@@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.ItemStack;
@@ -292,6 +293,20 @@ public class PunishPage extends CraftInventoryCustom implements Listener
 			}, 1, false, true), new PunishButton(this, Category.ChatOffense, 4, false, -1));
 		}
 
+		if (_plugin.GetClients().Get(_player).GetRank() == Rank.DEVELOPER || _plugin.GetClients().Get(_player).GetRank() == Rank.JNR_DEV)
+		{
+			ShopItem devWarning = new ShopItem(Material.YELLOW_FLOWER, "DEV WARNING", new String[] {ChatColor.RESET + "Developers are advised against using the punish system", ChatColor.RESET + "unless permitted by LT"}, 1, true, true);
+			devWarning.addGlow();
+
+			AddButton(0, devWarning, new IButton()
+			{
+				@Override
+				public void onClick(Player player, ClickType clickType)
+				{
+				}
+			});
+		}
+
 		Collections.sort(punishments, new PunishmentSorter());
 
 		int slot = 45;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java
index ff2a51f08..1067506b0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/RestartServerCommand.java
@@ -15,7 +15,7 @@ public class RestartServerCommand extends CommandBase<FileUpdater>
 {
 	public RestartServerCommand(FileUpdater plugin)
 	{
-		super(plugin, Rank.ADMIN, "restart");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "restart");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsCommand.java
index dd1e33d77..a9e6cf029 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsCommand.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsCommand.java
@@ -10,7 +10,7 @@ public class NewsCommand extends MultiCommandBase<HubManager>
 {	
 	public NewsCommand(HubManager plugin)
 	{
-		super(plugin, Rank.ADMIN, "news");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "news");
 		
 		AddCommand(new NewsAddCommand(plugin));
 		AddCommand(new NewsDeleteCommand(plugin));
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsListCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsListCommand.java
index e3ca7c240..fa32eb919 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsListCommand.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/commands/NewsListCommand.java
@@ -19,7 +19,7 @@ public class NewsListCommand extends CommandBase<HubManager>
 {
 	public NewsListCommand(HubManager plugin)
 	{
-		super(plugin, Rank.ADMIN, "list");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "list");
 	}
 	
 	@Override

From 421eb12228eeeafeb6ae72f677350a511ddde723 Mon Sep 17 00:00:00 2001
From: Conrad <cdstosz@gmail.com>
Date: Mon, 27 Jul 2015 08:47:40 -0400
Subject: [PATCH 054/113] Add jedis pool caching.

This commit seeks to reduce the number of idle connections to redis that
our code uses by making clients share thread-safe connection pools
(which is the point of a connection pool). This only changes utility
methods to generate and access jedis pools, and does not seek to address
any issues relating to the use of the connections that may or may not be
causing problems.

The changes are as follows:
1. Add a static cache of all connection pools - Each connection pool is
distinguished by its ip and port. Two requested connections to the same
ip:port combinations will use the same connection pool.
2. Increase the max size of each pool to 20 - Overall, by having fewer
idle connections, this commit should still end up with fewer connections
going at any given time.
3. Make explicit setting to block while waiting for a connection - This
should already be the default, but it is made explicit just in case.
---
 .../src/mineplex/serverdata/Utility.java      | 67 +++++++++++++------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
index 790a2efa3..b71a39583 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
@@ -1,5 +1,7 @@
 package mineplex.serverdata;
 
+import java.util.concurrent.ConcurrentHashMap;
+
 import mineplex.serverdata.servers.ConnectionData;
 import mineplex.serverdata.servers.ServerManager;
 import redis.clients.jedis.Jedis;
@@ -15,17 +17,20 @@ import com.google.gson.GsonBuilder;
  * @author Ty
  *
  */
-public class Utility 
+public class Utility
 {
 
 	// The Gson instance used to serialize/deserialize objects in JSON form.
 	private static Gson _gson = new GsonBuilder().create();
 	public static Gson getGson() { return _gson; }
-	
+
+    // map of all instantiated connection pools, distinguished by their ip:port combination
+    private static final ConcurrentHashMap<String, JedisPool> _pools = new ConcurrentHashMap<String, JedisPool>();
+
 	// Public static jedis pool for interacting with central default jedis repo.
 	private static JedisPool _masterPool;
 	private static JedisPool _slavePool;
-	
+
 	/**
 	 * @param object - the (non-null) object to serialize
 	 * @return the serialized form of {@code object}.
@@ -34,7 +39,7 @@ public class Utility
 	{
 		return _gson.toJson(object);
 	}
-	
+
 	/**
 	 * @param serializedData - the serialized data to be deserialized
 	 * @param type - the resulting class type of the object to be deserialized
@@ -44,7 +49,7 @@ public class Utility
 	{
 		return _gson.fromJson(serializedData, type);
 	}
-	
+
 	/**
 	 * @param delimiter - the delimiter character used to separate the concatenated elements
 	 * @param elements - the set of string elements to be concatenated and returned.
@@ -54,15 +59,15 @@ public class Utility
 	{
 		int length = elements.length;
 		String result = length > 0 ? elements[0] : new String();
-		
+
 		for (int i = 1; i < length; i++)
 		{
 			result += delimiter + elements[i];
 		}
-		
+
 		return result;
 	}
-	
+
 	/**
 	 * @return the current timestamp (in seconds) fetched from the central jedis repository
 	 * for synced timestamps.
@@ -72,7 +77,7 @@ public class Utility
 		long currentTime = 0;
 		JedisPool pool = getPool(false);
 		Jedis jedis = pool.getResource();
-		
+
 		try
 		{
 			currentTime = Long.parseLong(jedis.time().get(0));
@@ -90,10 +95,10 @@ public class Utility
 				pool.returnResource(jedis);
 			}
 		}
-		
+
 		return currentTime;
 	}
-	
+
 	/**
 	 * @return the current timestamp (in milliseconds) fetched from the central jedis repository
 	 * for synced timestamps.
@@ -121,23 +126,35 @@ public class Utility
 				pool.returnResource(jedis);
 			}
 		}
-		
+
 		return currentTime * 1000;
 	}
-	
+
 	/**
 	 * @param connData - the connection data specifying the database to be connected to.
 	 * @return a newly instantiated {@link JedisPool} connected to the provided {@link ConnectionData} repository.
 	 */
 	public static JedisPool generatePool(ConnectionData connData)
 	{
-		JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-	    jedisPoolConfig.setMaxWaitMillis(1000);
-	    jedisPoolConfig.setMinIdle(5);
-	    jedisPoolConfig.setTestOnBorrow(true);
-		return new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
+	    String key = getConnKey(connData);
+	    JedisPool pool = _pools.get(key);
+	    if (pool == null)
+	    {
+	        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
+	        jedisPoolConfig.setMaxWaitMillis(1000);
+	        jedisPoolConfig.setMinIdle(5);
+	        jedisPoolConfig.setTestOnBorrow(true);
+
+	        jedisPoolConfig.setMaxTotal(20);
+	        jedisPoolConfig.setBlockWhenExhausted(true);
+
+	        pool = new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
+	        _pools.put(key, pool);
+	    }
+
+	    return pool;
 	}
-	
+
 	/**
 	 * @param writeable - whether or not the Jedis connections returned should be writeable to.
 	 * @return a globally available {@link JedisPool}
@@ -150,7 +167,7 @@ public class Utility
 			{
 				_masterPool = generatePool(ServerManager.getMasterConnection());
 			}
-			
+
 			return _masterPool;
 		}
 		else
@@ -158,11 +175,17 @@ public class Utility
 			if (_slavePool == null)
 			{
 				ConnectionData slave = ServerManager.getSlaveConnection();
-				
+
 				_slavePool = generatePool(slave);
 			}
-			
+
 			return _slavePool;
 		}
 	}
+
+    private static String getConnKey(ConnectionData connData)
+    {
+        return connData.getHost() + ":" + connData.getPort();
+    }
+
 }

From 0c4a7a847f0187a471ae7fdaf64b1b8971b49be7 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Mon, 27 Jul 2015 15:53:39 +0200
Subject: [PATCH 055/113] fixed annoying color bug!

---
 .../src/mineplex/core/stats/command/TimeCommand.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
index 2754465d8..42fe8b841 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
@@ -71,7 +71,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 			else
 			{
 				long time = Plugin.Get(target).getStat("Global.TimeInGame");
-				UtilPlayer.message(caller, F.main("Time", F.name(target.getName() + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game")));
+				UtilPlayer.message(caller, F.main("Time", F.name(target.getName()) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
 			}
 		}
 	}

From 572ae1e99b54399bc92608bdb9c3a2b1abc33c75 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Mon, 27 Jul 2015 18:22:24 +0200
Subject: [PATCH 056/113] Updating Team names.

---
 .../game/games/skywars/TeamSkywars.java       | 26 +++++++++----------
 .../game/games/smash/TeamSuperSmash.java      | 26 +++++++++----------
 .../survivalgames/TeamSurvivalGames.java      | 26 +++++++++----------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index a97d87efc..13847a00e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -134,19 +134,19 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Custard", "Lemons"}),
-		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Leaves", "Grass"}),
-		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
-		RED(ChatColor.RED, new String[]{"Jam", "Lava", "Nether"}),
-		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
-		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"Spooky", "Lapis", "Tears"}),
-		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
-		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
-		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
-		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
-		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
+		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
+		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
+		GOLD(ChatColor.GOLD, new String[]{"Mango", "Foxes", "Sunset", "Nuggets", "Lion", "Desert", "Gapple"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Dream", "Cupcake", "Cake", "Candy", "Unicorn"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"Squid", "Lapis", "Sharks", "Galaxy", "Empoleon"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Rose", "Apple", "Twizzler", "Rocket", "Blood"}),
+		WHITE(ChatColor.WHITE, new String[]{"Ghosts", "Spookies", "Popcorn", "Seagull", "Rice", "Snowman", "Artic"}),
+		BLUE(ChatColor.BLUE, new String[]{"Sky", "Whale", "Lake", "Birds", "Bluebird", "Piplup"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Forest", "Zombies", "Cactus", "Slime", "Toxic", "Poison"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Amethyst", "Slugs", "Grape", "Witch", "Magic", "Zula"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Snorlax", "Aquatic", "Clam", "Fish"});
 		
 		private ChatColor color;
 		private String[] names;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index a9e83cdc9..b76f53b26 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -153,19 +153,19 @@ public class TeamSuperSmash extends SuperSmash
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
-		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
-		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
-		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
-		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
-		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
-		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
-		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
-		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
-		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
-		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
+		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
+		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
+		GOLD(ChatColor.GOLD, new String[]{"Mango", "Foxes", "Sunset", "Nuggets", "Lion", "Desert", "Gapple"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Dream", "Cupcake", "Cake", "Candy", "Unicorn"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"Squid", "Lapis", "Sharks", "Galaxy", "Empoleon"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Rose", "Apple", "Twizzler", "Rocket", "Blood"}),
+		WHITE(ChatColor.WHITE, new String[]{"Ghosts", "Spookies", "Popcorn", "Seagull", "Rice", "Snowman", "Artic"}),
+		BLUE(ChatColor.BLUE, new String[]{"Sky", "Whale", "Lake", "Birds", "Bluebird", "Piplup"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Forest", "Zombies", "Cactus", "Slime", "Toxic", "Poison"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Amethyst", "Slugs", "Grape", "Witch", "Magic", "Zula"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Snorlax", "Aquatic", "Clam", "Fish"});
 		
 		private ChatColor color;
 		private String[] names;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 7e4339e97..c0113430a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -106,19 +106,19 @@ public class TeamSurvivalGames extends SurvivalGames
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananas", "Lemonade", "Lemons"}),
-		GREEN(ChatColor.GREEN, new String[]{"Tree", "Leaves", "Grass"}),
-		AQUA(ChatColor.AQUA, new String[]{"Sky", "Water", "Diamonds"}),
-		RED(ChatColor.RED, new String[]{"Fire", "Lava", "Nether"}),
-		GOLD(ChatColor.GOLD, new String[]{"Oranges", "Foxes", "Sunset"}),
-		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Pinky", "Pigies", "Pie"}),
-		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"River", "Lapis", "Tears"}),
-		DARK_RED(ChatColor.DARK_RED, new String[]{"Roses", "Apples", "Cherrys"}),
-		WHITE(ChatColor.WHITE, new String[]{"Paper", "Marbles", "Wall"}),
-		BLUE(ChatColor.BLUE, new String[]{"Ocean", "Sea", "Lake"}),
-		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Pears", "Nature"}),
-		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Purples", "Dreamy"}),
-		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Cyanics", "Aquatic"});
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
+		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
+		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
+		GOLD(ChatColor.GOLD, new String[]{"Mango", "Foxes", "Sunset", "Nuggets", "Lion", "Desert", "Gapple"}),
+		LIGHT_PURPLE(ChatColor.LIGHT_PURPLE, new String[]{"Dream", "Cupcake", "Cake", "Candy", "Unicorn"}),
+		DARK_BLUE(ChatColor.DARK_BLUE, new String[]{"Squid", "Lapis", "Sharks", "Galaxy", "Empoleon"}),
+		DARK_RED(ChatColor.DARK_RED, new String[]{"Rose", "Apple", "Twizzler", "Rocket", "Blood"}),
+		WHITE(ChatColor.WHITE, new String[]{"Ghosts", "Spookies", "Popcorn", "Seagull", "Rice", "Snowman", "Artic"}),
+		BLUE(ChatColor.BLUE, new String[]{"Sky", "Whale", "Lake", "Birds", "Bluebird", "Piplup"}),
+		DARK_GREEN(ChatColor.DARK_GREEN, new String[]{"Forest", "Zombies", "Cactus", "Slime", "Toxic", "Poison"}),
+		DARK_PURPLE(ChatColor.DARK_PURPLE, new String[]{"Amethyst", "Slugs", "Grape", "Witch", "Magic", "Zula"}),
+		DARK_AQUA(ChatColor.DARK_AQUA, new String[]{"Snorlax", "Aquatic", "Clam", "Fish"});
 		
 		private ChatColor color;
 		private String[] names;

From aaf49917373571f036578daeb9e4d4313930a4aa Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Mon, 27 Jul 2015 18:31:01 +0200
Subject: [PATCH 057/113] Fixing Banana team.

---
 .../nautilus/game/arcade/game/games/skywars/TeamSkywars.java    | 2 +-
 .../nautilus/game/arcade/game/games/smash/TeamSuperSmash.java   | 2 +-
 .../game/arcade/game/games/survivalgames/TeamSurvivalGames.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 13847a00e..53c7148cf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -134,7 +134,7 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index b76f53b26..6aa1dbcef 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -153,7 +153,7 @@ public class TeamSuperSmash extends SuperSmash
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index c0113430a..75aede149 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -106,7 +106,7 @@ public class TeamSurvivalGames extends SurvivalGames
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna ", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),

From 76e5d3d56227be07fddd162841168bf7c4b1c7da Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Mon, 27 Jul 2015 18:18:37 +0100
Subject: [PATCH 058/113] Finish update

---
 .../privateServer/page/EditRotationPage.java  | 19 +++--
 .../privateServer/page/GameVotingPage.java    | 19 +++--
 .../gui/privateServer/page/OptionsPage.java   |  8 +++
 .../gui/privateServer/page/SetGamePage.java   | 19 +++--
 .../game/arcade/managers/GameHostManager.java | 70 ++++++++++++++++++-
 5 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index e2d391a1f..c2ed9bcdc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -78,10 +78,16 @@ public class EditRotationPage extends BasePage
 		allowedCats.add(GameCategory.EXTRA);
 
 		int gameSlot = 9;
-		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
-			addGameButton(gameSlot, type, enabledGames.contains(type));
-			gameSlot++;
+			if (!allowedCats.contains(cat))
+				return;
+
+			for (GameType type : _manager.getGames(getPlayer()).get(cat))
+			{
+				addGameButton(gameSlot, type, enabledGames.contains(type));
+				gameSlot++;
+			}
 		}
 	}
 
@@ -89,7 +95,12 @@ public class EditRotationPage extends BasePage
 	{
 		String titleString = ChatColor.RESET + (enabled ? C.cGreen : C.cRed) + ChatColor.BOLD + type.GetName();
 		String infoString = ChatColor.RESET + C.cGray + (enabled ? "Click to Disable" : "Click to Enable");
-		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), titleString, new String[]{infoString}, 1, false, false);
+		String[] lore = new String[]{infoString};
+		if (_manager.hasWarning().contains(type))
+		{
+			lore = new String[]{infoString, "§1", "§c§lWARNING: §fThis game was rejected!"};
+		}
+		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), titleString, lore, 1, false, false);
 		int itemCount = enabled ? 1 : 0;
 
 		addButtonFakeCount(slot, shopItem, new IButton()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index fa645a7e4..dea63c263 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -56,16 +56,22 @@ public class GameVotingPage extends BasePage
 		allowedCats.add(GameCategory.EXTRA);
 
 		int gameSlot = 9;
-		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
-			addGameButton(gameSlot, type);
-			gameSlot++;
+			if (!allowedCats.contains(cat))
+				return;
+
+			for (GameType type : _manager.getGames(getPlayer()).get(cat))
+			{
+				addGameButton(gameSlot, type);
+				gameSlot++;
+			}
 		}
 	}
 
 	private void addCloseButton(int slot)
 	{
-		ShopItem item = new ShopItem(Material.BED, (byte)0, "§c§lClose Menu", new String[]{}, 1, false, false);
+		ShopItem item = new ShopItem(Material.BED, (byte)0, "§cClose Menu", new String[]{}, 1, false, false);
 		addButton(slot, item, new IButton()
 		{
 			@Override
@@ -131,6 +137,11 @@ public class GameVotingPage extends BasePage
 				votes++;
 		}
 		String curVotes = "§7Votes: §e" + votes;
+		String[] lore = new String[]{click, curVotes};
+		if (_manager.hasWarning().contains(type))
+		{
+			lore = new String[]{click, curVotes, "§1", "§c§lWARNING: §fThis game was rejected!"};
+		}
 		ShopItem item = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), new String[]{click, curVotes}, 1, false, false);
 		if (votes >= 1)
 		{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
index 1b7dbaf12..8b7c5b0e0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
@@ -138,6 +138,14 @@ public class OptionsPage extends BasePage
 				ChatColor.RED + " ",
 				ChatColor.RESET + "Click to " + (preference ? "Disable" : "Enable") };
 
+		if (name.equalsIgnoreCase("Enforce Whitelist"))
+		{
+			description = new String[] {
+					"" + (preference ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled"),
+					ChatColor.RED + " ",
+					ChatColor.RESET + "Click to " + (preference ? "Disable" : "Enable"), "", "§7Use §a/whitelist §e<name>" };
+		}
+
 		addButton(index, new ShopItem(material, data, (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
 		addButton(index + 9, new ShopItem(Material.INK_SACK, (preference ? (byte) 10 : (byte) 8), (preference ? ChatColor.GREEN : ChatColor.RED) + name, description, 1, false, false), button);
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index 776717238..dd176e97f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -74,10 +74,16 @@ public class SetGamePage extends BasePage
 		allowedCats.add(GameCategory.EXTRA);
 
 		int gameSlot = 9;
-		for (GameType type : _manager.getAvailableGames(getPlayer()))
+		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
-			addGameButton(gameSlot, type);
-			gameSlot++;
+			if (!allowedCats.contains(cat))
+				return;
+
+			for (GameType type : _manager.getGames(getPlayer()).get(cat))
+			{
+				addGameButton(gameSlot, type);
+				gameSlot++;
+			}
 		}
 	}
 
@@ -87,7 +93,12 @@ public class SetGamePage extends BasePage
 		String space = "§1";
 		String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §fRandom Map§7.";
 		String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §fChoose Map§7.";
-		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), new String[]{infoString, space, left, right}, 1, false, false);
+		String[] normLore = new String[]{infoString, space, left, right};
+		if (_manager.hasWarning().contains(type))
+		{
+			normLore = new String[]{infoString, space, left, right, "§2", "§c§lWARNING: §fThis game was rejected!"};
+		}
+		ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), normLore, 1, false, false);
 		addButton(slot, shopItem, new IButton()
 		{
 			@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 77deb6fa7..d4d62cb0e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -12,6 +12,7 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTextBottom;
 import mineplex.core.common.util.UtilTime;
+import mineplex.core.game.GameCategory;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -134,6 +135,16 @@ public class GameHostManager implements Listener
 		}
 	}
 
+	public ArrayList<GameType> hasWarning()
+	{
+		ArrayList<GameType> games = new ArrayList<>();
+		games.add(GameType.Evolution);
+		games.add(GameType.MilkCow);
+		games.add(GameType.SearchAndDestroy);
+		games.add(GameType.ZombieSurvival);
+		return games;
+	}
+
 	@EventHandler
 	public void updateHost(UpdateEvent event)
 	{
@@ -361,6 +372,40 @@ public class GameHostManager implements Listener
 		return _adminList;
 	}
 
+	@EventHandler
+	public void broadcastCommand(PlayerCommandPreprocessEvent event)
+	{
+		if (!event.getMessage().toLowerCase().startsWith("/bc"))
+			return;
+
+		if (!isPrivateServer())
+			return;
+
+		if (!isAdmin(event.getPlayer(), true))
+		{
+			event.getPlayer().sendMessage(F.main("Broadcast", "Only MPS admins can use this command."));
+			event.setCancelled(true);
+			return;
+		}
+
+		event.setCancelled(true);
+
+		if (event.getMessage().split(" ").length < 2)
+		{
+			event.getPlayer().sendMessage(F.main("Broadcast", "/bc <message>"));
+			return;
+		}
+
+		String msg = "";
+		for (int i = 1; i < event.getMessage().split(" ").length; i++)
+		{
+			msg += event.getMessage().split(" ")[i] + " ";
+		}
+		msg = msg.trim();
+
+		Bukkit.broadcastMessage("§6§l" + event.getPlayer().getName() + " §e" + msg);
+	}
+
 	@EventHandler
 	public void voteCommand(PlayerCommandPreprocessEvent event)
 	{
@@ -445,6 +490,11 @@ public class GameHostManager implements Listener
 		
 		if (!event.getMessage().toLowerCase().startsWith("/whitelist "))
 			return;
+
+		if (!isPrivateServer())
+			return;
+
+		event.setCancelled(true);
 		
 		String[] args = event.getMessage().split(" ");
 		
@@ -454,7 +504,7 @@ public class GameHostManager implements Listener
 			
 			if (_whitelist.add(name))
 			{
-				UtilPlayer.message(event.getPlayer(), F.main("Host", "Added " + F.elem(name) + " to the whitelist."));
+				UtilPlayer.message(event.getPlayer(), F.main("Host", "Added " + F.elem(args[i]) + " to the whitelist."));
 			}
 		}
 	}
@@ -539,6 +589,24 @@ public class GameHostManager implements Listener
 		return games;
 	}
 
+	public HashMap<GameCategory, ArrayList<GameType>> getGames(Player p)
+	{
+		HashMap<GameCategory, ArrayList<GameType>> games = new HashMap<GameCategory, ArrayList<GameType>>();
+		for (GameCategory cat : GameCategory.values())
+		{
+			ArrayList<GameType> types = new ArrayList<>();
+			for (GameType type : getAvailableGames(p))
+			{
+				if (type.getGameCategory().equals(cat))
+				{
+					types.add(type);
+				}
+			}
+			games.put(cat, types);
+		}
+		return games;
+	}
+
 	public void ban(Player player)
 	{
 		_blacklist.add(player.getName());

From 8385c8a7c75959b9d5dbbeca3c93ac825c14b843 Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Mon, 27 Jul 2015 22:18:41 +0100
Subject: [PATCH 059/113] Whitelist fix

---
 .../src/nautilus/game/arcade/managers/GameHostManager.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index d4d62cb0e..47d473cbf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -488,7 +488,7 @@ public class GameHostManager implements Listener
 		if (_host == null || !event.getPlayer().equals(_host))
 			return;
 		
-		if (!event.getMessage().toLowerCase().startsWith("/whitelist "))
+		if (!event.getMessage().toLowerCase().startsWith("/whitelist"))
 			return;
 
 		if (!isPrivateServer())

From dd53d268e4fa1b8df96b7e89ee3a8a49c74ee5e4 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 28 Jul 2015 08:46:37 -0400
Subject: [PATCH 060/113] Fixed waller kit bc I was stupid before ;c

---
 .../arcade/game/games/lobbers/kits/KitWaller.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
index 022fb8b75..bb1bcd46a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
@@ -1,5 +1,6 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
+import mineplex.core.achievement.Achievement;
 import mineplex.core.common.util.F;
 import mineplex.core.itemstack.ItemBuilder;
 import nautilus.game.arcade.ArcadeManager;
@@ -27,6 +28,16 @@ public class KitWaller extends Kit
 				new PerkCraftman()
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.SMOOTH_BRICK).setUnbreakable(true).build());
+		
+		this.setAchievementRequirements(new Achievement[]
+				{
+				Achievement.BOMB_LOBBERS_WINS,
+				Achievement.BOMB_LOBBERS_ULTIMATE_KILLER,
+				Achievement.BOMB_LOBBERS_SNIPER,
+				Achievement.BOMB_LOBBERS_PROFESSIONAL_LOBBER,
+				Achievement.BOMB_LOBBERS_EXPLOSION_PROOF,
+				Achievement.BOMB_LOBBERS_BLAST_PROOF
+				});
 	}
 
 	@Override

From 2e58b75a1ba1f947f21bd856076c8253900319a3 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 28 Jul 2015 08:51:21 -0400
Subject: [PATCH 061/113] Fixed waller achievement thing

---
 .../nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
index bb1bcd46a..77dd9a950 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
@@ -47,3 +47,4 @@ public class KitWaller extends Kit
 	}
 
 }
+

From e4da4aa0eda1f60170aca463b5ad87125a9d5508 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Tue, 28 Jul 2015 10:14:25 -0700
Subject: [PATCH 062/113] Remove NPC commands

---
 Plugins/.idea/encodings.xml                                | 7 ++++---
 .../src/mineplex/core/npc/command/AddCommand.java          | 2 +-
 .../src/mineplex/core/npc/command/DeleteCommand.java       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Plugins/.idea/encodings.xml b/Plugins/.idea/encodings.xml
index e206d70d8..f75895965 100644
--- a/Plugins/.idea/encodings.xml
+++ b/Plugins/.idea/encodings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
index c03d5e8d0..08beeb4fe 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java
@@ -13,7 +13,7 @@ public class AddCommand extends CommandBase<NpcManager>
 {
 	public AddCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "add");
+		super(plugin, Rank.DEVELOPER, "add");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
index f6ec70ca5..4b7ab183b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java
@@ -12,7 +12,7 @@ public class DeleteCommand extends CommandBase<NpcManager>
 {
 	public DeleteCommand(NpcManager plugin)
 	{
-		super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "del");
+		super(plugin, Rank.DEVELOPER, "del");
 	}
 
 	@Override

From 99946ef1f371f0daa39a96be2dac8c559a00ce1b Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 28 Jul 2015 17:29:51 -0600
Subject: [PATCH 063/113] Tweaks

---
 .../game/games/lobbers/BombLobbers.java       |  6 ++---
 .../game/games/lobbers/kits/KitArmorer.java   | 24 +++++++------------
 .../game/games/lobbers/kits/KitJumper.java    | 10 ++++++--
 .../game/games/lobbers/kits/KitPitcher.java   | 23 ++++++++++--------
 .../game/arcade/kit/perks/PerkDummy.java      | 13 ++++++++++
 5 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDummy.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index 837104e2d..afedbd6a6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -466,13 +466,13 @@ public class BombLobbers extends TeamGame implements IThrown
 				{
 					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), -1, 1, 1, 1, 0,
-								ViewDist.NORMAL, UtilServer.getPlayers());
+								ViewDist.LONG, UtilServer.getPlayers());
 				}
 				else
 				{
 					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), 0, 0, 0, 0, 1,
-								ViewDist.NORMAL, UtilServer.getPlayers());
+								ViewDist.LONG, UtilServer.getPlayers());
 				}
 
 				//UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.6, 0.0), team.GetColorBase().getRed(), team.GetColorBase().getGreen(), team.GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
@@ -581,6 +581,6 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (event.GetCause() != DamageCause.ENTITY_EXPLOSION && event.GetCause() != DamageCause.BLOCK_EXPLOSION)
 			return;
 
-		event.AddKnockback("Explosion", 1.5D);
+		event.AddKnockback("Explosion", 1.7D);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
index 3a94cb31a..3aa7a4d67 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
@@ -8,10 +8,10 @@ import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkDummy;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 public class KitArmorer extends Kit
@@ -21,15 +21,18 @@ public class KitArmorer extends Kit
 	{
 		super(manager, "Armorer", KitAvailability.Gem, 2000, new String[]
 				{
-				"He uses his expert armor-making",
-				"skills to block excess damage!",
-				"",
-				C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
+				C.cGray + "He uses his expert armor-making",
+				C.cGray + "skills to block excess damage!"
 				}, new Perk[]
 						{
+				new PerkDummy("Armorer",
+						new String[]
+								{
+						C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
+								}),
 				new PerkCraftman()
 						}, EntityType.ZOMBIE,
-				new ItemBuilder(Material.GOLD_INGOT).build());
+				new ItemBuilder(Material.GOLD_CHESTPLATE).build());
 	}
 	
 	@Override
@@ -49,15 +52,6 @@ public class KitArmorer extends Kit
 		
 		UtilInv.Update(player);
 	}
-	
-	@Override
-	public void SpawnCustom(LivingEntity ent)
-	{
-		ent.getEquipment().setHelmet(new ItemBuilder(Material.GOLD_HELMET).build());
-		ent.getEquipment().setChestplate(new ItemBuilder(Material.GOLD_CHESTPLATE).build());
-		ent.getEquipment().setLeggings(new ItemBuilder(Material.GOLD_LEGGINGS).build());
-		ent.getEquipment().setBoots(new ItemBuilder(Material.GOLD_BOOTS).build());
-	}
 
 	@Override
 	public void GiveItems(Player player)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
index ec0a9cbe7..eec22c8b8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
@@ -1,5 +1,6 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
+import mineplex.core.common.util.C;
 import mineplex.core.itemstack.ItemBuilder;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.ArcadeManager;
@@ -8,6 +9,7 @@ import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
 import nautilus.game.arcade.kit.perks.PerkDoubleJump;
+import nautilus.game.arcade.kit.perks.PerkDummy;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
@@ -22,11 +24,15 @@ public class KitJumper extends Kit
 	{
 		super(manager, "Jumper", KitAvailability.Free, 0, new String[]
 				{
-				"Use your jumping abilities to leap away from trouble!",
-				"You take no fall damage."
+				C.cGray + "Use your jumping abilities to leap away from trouble!"
 				}, new Perk[]
 						{
 				new PerkDoubleJump("Double Jump", 1.2, 1.2, false, 6000, true),
+				new PerkDummy("Feathered Boots", 
+						new String[]
+								{
+						C.cGray + "You take no fall damage."
+								}),
 				new PerkCraftman()
 						}, EntityType.ZOMBIE, new ItemBuilder(Material.IRON_AXE).build());
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
index 8e69a8499..b81bd916d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
@@ -13,6 +13,7 @@ import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkDummy;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
@@ -27,14 +28,16 @@ public class KitPitcher extends Kit
 	{
 		super(manager, "Pitcher", KitAvailability.Gem, 4000, new String[]
 				{
-				"He can easily pitch the perfect shot for any occasion.",
-				"",
-				C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Velocity",
-				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Velocity",
-				"Maximum Velocity of " + C.cYellow + "3.",
-				"Minimum Velocity of " + C.cYellow + "1.",
+				C.cGray + "He can easily pitch the perfect",
+				C.cGray + "shot for any occasion."
 				}, new Perk[]
 						{
+				new PerkDummy("Pitcher",
+						new String[]
+								{
+						C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Velocity. " + C.cGray + "Minimum of 1.",
+						C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Velocity. " + C.cGray + "Maximum of 3.",
+								}),
 				new PerkCraftman()
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.LEVER).build());
@@ -43,7 +46,7 @@ public class KitPitcher extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).setAmount(3).build());
+		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).setAmount(2).build());
 	}
 
 	@EventHandler
@@ -112,11 +115,11 @@ public class KitPitcher extends Kit
 	private double getVelocity(int amount)
 	{
 		if (amount == 1)
-			return 1.5;
-		
-		if (amount == 2)
 			return 1.75;
 		
+		if (amount == 3)
+			return 2.25;
+		
 		return 2.0;
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDummy.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDummy.java
new file mode 100644
index 000000000..aaf8c8bc9
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDummy.java
@@ -0,0 +1,13 @@
+package nautilus.game.arcade.kit.perks;
+
+import nautilus.game.arcade.kit.Perk;
+
+public class PerkDummy extends Perk
+{
+
+	public PerkDummy(String name, String[] perkDesc)
+	{
+		super(name, perkDesc);
+	}
+
+}

From 3e0eb0311294e6a8187342d56e9002be8a03232f Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 28 Jul 2015 20:39:55 -0600
Subject: [PATCH 064/113] Final tweaks. this is as good as it's goign to get!
 ;d

---
 .../game/arcade/game/games/lobbers/BombLobbers.java  |  4 ++--
 .../arcade/game/games/lobbers/kits/KitArmorer.java   | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index afedbd6a6..b7d638eb2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -466,13 +466,13 @@ public class BombLobbers extends TeamGame implements IThrown
 				{
 					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), -1, 1, 1, 1, 0,
-								ViewDist.LONG, UtilServer.getPlayers());
+								ViewDist.NORMAL, UtilServer.getPlayers());
 				}
 				else
 				{
 					for (int i = 0 ; i < 2 ; i++)
 						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), 0, 0, 0, 0, 1,
-								ViewDist.LONG, UtilServer.getPlayers());
+								ViewDist.NORMAL, UtilServer.getPlayers());
 				}
 
 				//UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.6, 0.0), team.GetColorBase().getRed(), team.GetColorBase().getGreen(), team.GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
index 3aa7a4d67..f36b6e3aa 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
@@ -12,7 +12,9 @@ import nautilus.game.arcade.kit.perks.PerkDummy;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 public class KitArmorer extends Kit
 {
@@ -32,7 +34,7 @@ public class KitArmorer extends Kit
 								}),
 				new PerkCraftman()
 						}, EntityType.ZOMBIE,
-				new ItemBuilder(Material.GOLD_CHESTPLATE).build());
+				new ItemBuilder(Material.GOLD_HELMET).build());
 	}
 	
 	@Override
@@ -53,6 +55,14 @@ public class KitArmorer extends Kit
 		UtilInv.Update(player);
 	}
 
+	@Override
+	public void SpawnCustom(LivingEntity entity)
+	{
+		entity.getEquipment().setChestplate(new ItemStack(Material.GOLD_CHESTPLATE));
+		entity.getEquipment().setLeggings(new ItemStack(Material.GOLD_LEGGINGS));
+		entity.getEquipment().setBoots(new ItemStack(Material.GOLD_BOOTS));
+	}
+	
 	@Override
 	public void GiveItems(Player player)
 	{

From d0a45461d07904f70b5e42dee391f69843fb3978 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 28 Jul 2015 21:25:29 -0600
Subject: [PATCH 065/113] Fixed bug with direct hit

---
 .../nautilus/game/arcade/game/games/lobbers/BombLobbers.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
index b7d638eb2..e43c1adb1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -561,7 +561,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (target != null)
 			UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown().getLocation(), target.getLocation()), .2, false, 0, 0.2, .4, true);
 		
-		Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null, DamageCause.PROJECTILE, 6.0, false, false, true, "Throwing TNT", "Throwing TNT Direct Hit");
+		Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null, DamageCause.PROJECTILE, 10.0, false, false, false, "Throwing TNT", "Throwing TNT Direct Hit");
 	}
 
 	@Override

From 5af68e5628a81f7a41a226d5bff559bee55bd418 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Tue, 28 Jul 2015 23:55:27 -0700
Subject: [PATCH 066/113] Fulfill Shaun's request

---
 .../src/mineplex/core/achievement/AchievementManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
index 70348c191..485f5a124 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
@@ -222,7 +222,7 @@ public class AchievementManager extends MiniPlugin
 		if (rank.Has(Rank.OWNER))
 			level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
 
-		if (sender.getName().equalsIgnoreCase("Phinary") || sender.getName().equalsIgnoreCase("Horus"))
+		if (sender.getName().equalsIgnoreCase("Phinary"))
 			level = -level;
 		
 		return level;

From b42be044aef015d87f628ba2c6059adc9b492e4d Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 13:20:20 +0200
Subject: [PATCH 067/113] whtielisted MPS will be hidden from GUI

---
 .../src/nautilus/game/arcade/ArcadeManager.java                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 59bb9719d..d54d571ce 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -653,7 +653,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 				return;
 			}
 			
-			if (!GetServerConfig().PublicServer)
+			if (!GetServerConfig().PublicServer || GetServerConfig().PlayerServerWhitelist)
 			{
 				event.setMotd(ChatColor.GRAY + "Private");
 				return;

From ef89b96144ef7ce6fc18eda0eb0d447159a2a28e Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 14:02:56 +0200
Subject: [PATCH 068/113] fixed game page bug

---
 .../game/arcade/gui/privateServer/page/SetGamePage.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index dd176e97f..d2d0b4092 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -72,15 +72,15 @@ public class SetGamePage extends BasePage
 		allowedCats.add(GameCategory.SURVIVAL);
 		allowedCats.add(GameCategory.CHAMPIONS);
 		allowedCats.add(GameCategory.EXTRA);
-
+		
 		int gameSlot = 9;
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
 			if (!allowedCats.contains(cat))
-				return;
+				continue;
 
 			for (GameType type : _manager.getGames(getPlayer()).get(cat))
-			{
+			{	
 				addGameButton(gameSlot, type);
 				gameSlot++;
 			}

From 30f0b3cb603a26d18fa9475f881eb8b79a5bf19f Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 14:25:15 +0200
Subject: [PATCH 069/113] fixed close spawn stuff

---
 .../src/nautilus/game/arcade/game/GameTeam.java               | 4 ++--
 .../nautilus/game/arcade/game/games/smash/TeamSuperSmash.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index d73da8f35..4d8d686c9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -136,14 +136,14 @@ public class GameTeam
 			//Spawn near players 
 			if (Host.SpawnNearEnemies)
 			{
-				Location loc = UtilAlg.getLocationAwayFromPlayers(_spawns, Host.GetPlayers(true));
+				Location loc = UtilAlg.getLocationNearPlayers(_spawns, Host.GetPlayers(true), Host.GetPlayers(true));
 				if (loc != null)
 					return loc;
 			}
 			//Spawn away from players
 			else
 			{
-				Location loc = UtilAlg.getLocationNearPlayers(_spawns, Host.GetPlayers(true), Host.GetPlayers(true));
+				Location loc = UtilAlg.getLocationAwayFromPlayers(_spawns, Host.GetPlayers(true));
 				if (loc != null)
 					return loc;
 			}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 6aa1dbcef..1b8097c13 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -47,7 +47,7 @@ public class TeamSuperSmash extends SuperSmash
 		this.PlayersPerTeam = 2;
 		this.FillTeamsInOrderToCount = 2;
 		
-		this.SpawnNearAllies = true;
+		this.SpawnNearAlliesz = true;
 		this.DamageTeamSelf = false;
 	}
 

From f82defb1db07e0d9f212c51accdad2c6b2a8553d Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Wed, 29 Jul 2015 13:27:26 +0100
Subject: [PATCH 070/113] Whitelist

---
 .../privateServer/page/EditRotationPage.java  |  2 +-
 .../privateServer/page/GameVotingPage.java    |  2 +-
 .../privateServer/page/WhitelistedPage.java   | 33 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index c2ed9bcdc..6a883e6e8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -81,7 +81,7 @@ public class EditRotationPage extends BasePage
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
 			if (!allowedCats.contains(cat))
-				return;
+				continue;
 
 			for (GameType type : _manager.getGames(getPlayer()).get(cat))
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index dea63c263..7c2cf8488 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -59,7 +59,7 @@ public class GameVotingPage extends BasePage
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
 		{
 			if (!allowedCats.contains(cat))
-				return;
+				continue;
 
 			for (GameType type : _manager.getGames(getPlayer()).get(cat))
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java
new file mode 100644
index 000000000..0b23a5be6
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java
@@ -0,0 +1,33 @@
+package nautilus.game.arcade.gui.privateServer.page;
+
+import org.bukkit.entity.Player;
+
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 29/07/15
+ */
+public class WhitelistedPage extends BasePage
+{
+	public WhitelistedPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
+	{
+		super(plugin, shop, "Whitelisted Players", player);
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+
+	}
+
+	private void addPlayerButton(Player p)
+	{
+
+	}
+}

From 1c2bd988f94febdb96b40508b4fce01704412318 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 15:10:21 +0200
Subject: [PATCH 071/113] fixed spawns for team gameds

---
 .../src/nautilus/game/arcade/game/games/skywars/Skywars.java  | 2 --
 .../src/nautilus/game/arcade/game/games/smash/SuperSmash.java | 4 +---
 .../nautilus/game/arcade/game/games/smash/TeamSuperSmash.java | 2 +-
 .../game/arcade/game/games/survivalgames/SurvivalGames.java   | 4 +---
 .../arcade/game/games/survivalgames/SurvivalGamesTeams.java   | 4 +++-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index deb1c5672..010303156 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -155,8 +155,6 @@ public abstract class Skywars extends Game
 
 		WorldTimeSet = 0;	
 		WorldBoundaryKill = false;
-		
-		SpawnNearAllies = true;
 
 		DamageSelf = true;
 		DamageTeamSelf = true;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index a255d196c..67fc55802 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -120,8 +120,6 @@ public abstract class SuperSmash extends Game
 
 		this.DeathSpectateSecs = 4;
 
-		this.SpawnNearAllies = true;
-
 		this.WorldWaterDamage = 1000;
 		
 		this.HideTeamSheep = true;
@@ -180,7 +178,7 @@ public abstract class SuperSmash extends Game
 		if (lives > 0)
 		{
 			UtilPlayer.message(player, C.cRed + C.Bold + "You have died!");
-			UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + (lives == 1 ? "life" : "lives") + " left!");
+			UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + " " + (lives == 1 ? "life" : "lives") + " left!");
 			player.playSound(player.getLocation(), Sound.NOTE_BASS_GUITAR, 2f, 0.5f);
 
 			_lives.put(player, lives);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 1b8097c13..6aa1dbcef 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -47,7 +47,7 @@ public class TeamSuperSmash extends SuperSmash
 		this.PlayersPerTeam = 2;
 		this.FillTeamsInOrderToCount = 2;
 		
-		this.SpawnNearAlliesz = true;
+		this.SpawnNearAllies = true;
 		this.DamageTeamSelf = false;
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index ce66cd5bd..3c6e05d7a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -220,9 +220,7 @@ public abstract class SurvivalGames extends Game
 
 		WorldTimeSet = 0;
 		WorldBoundaryKill = false;
-		SpawnNearAllies = true;
-		SpawnNearEnemies = true; //This is to ensure theres no 'gaps' of 1 between teams, hence forcing a team to get split.
-
+	
 		DamageSelf = true;
 		DamageTeamSelf = true;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
index 049b93826..f6385469e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
@@ -176,7 +176,9 @@ public class SurvivalGamesTeams extends TeamGame
 		this.WorldTimeSet = 0;
 		this.WorldBoundaryKill = false; 
 		
-
+		SpawnNearAllies = true;
+		SpawnNearEnemies = true; //This is to ensure theres no 'gaps' of 1 between teams, hence forcing a team to get split.
+		
 		this.DamageSelf = true;
 		this.DamageTeamSelf = false;
 

From 3bc66f16b652cb2b68f56c7d9f4e106a2ed824cb Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Wed, 29 Jul 2015 14:22:49 +0100
Subject: [PATCH 072/113] Woo a push

---
 .../game/games/smash/TeamSuperSmash.java      |  2 +-
 .../privateServer/button/WhitelistButton.java | 34 +++++++++++++++++++
 .../privateServer/page/EditRotationPage.java  |  1 +
 .../privateServer/page/GameVotingPage.java    |  1 +
 .../gui/privateServer/page/MenuPage.java      |  8 +++--
 .../gui/privateServer/page/OptionsPage.java   |  2 ++
 .../gui/privateServer/page/SetGamePage.java   |  1 +
 .../privateServer/page/WhitelistedPage.java   | 20 ++++++++---
 .../game/arcade/managers/GameHostManager.java | 13 ++++---
 9 files changed, 71 insertions(+), 11 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 1b8097c13..6aa1dbcef 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -47,7 +47,7 @@ public class TeamSuperSmash extends SuperSmash
 		this.PlayersPerTeam = 2;
 		this.FillTeamsInOrderToCount = 2;
 		
-		this.SpawnNearAlliesz = true;
+		this.SpawnNearAllies = true;
 		this.DamageTeamSelf = false;
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java
new file mode 100644
index 000000000..768b4013f
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java
@@ -0,0 +1,34 @@
+package nautilus.game.arcade.gui.privateServer.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+import nautilus.game.arcade.gui.privateServer.page.WhitelistedPage;
+
+/**
+ * Created by WilliamTiger.
+ * All the code and any API's associated with it
+ * are not to be used anywhere else without written
+ * consent of William Burns. 2015.
+ * 29/07/15
+ */
+public class WhitelistButton implements IButton
+{
+	private ArcadeManager _arcadeManager;
+	private PrivateServerShop _shop;
+
+	public WhitelistButton(ArcadeManager arcadeManager, PrivateServerShop shop)
+	{
+		_shop = shop;
+		_arcadeManager = arcadeManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_shop.openPageForPlayer(player, new WhitelistedPage(_arcadeManager, _shop, player));
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
index 6a883e6e8..c9013e742 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java
@@ -76,6 +76,7 @@ public class EditRotationPage extends BasePage
 		allowedCats.add(GameCategory.SURVIVAL);
 		allowedCats.add(GameCategory.CHAMPIONS);
 		allowedCats.add(GameCategory.EXTRA);
+		allowedCats.add(GameCategory.TEAM_VARIANT);
 
 		int gameSlot = 9;
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
index 7c2cf8488..dbb24a7b1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java
@@ -54,6 +54,7 @@ public class GameVotingPage extends BasePage
 		allowedCats.add(GameCategory.SURVIVAL);
 		allowedCats.add(GameCategory.CHAMPIONS);
 		allowedCats.add(GameCategory.EXTRA);
+		allowedCats.add(GameCategory.TEAM_VARIANT);
 
 		int gameSlot = 9;
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
index 615d8552b..c24a31d78 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java
@@ -26,6 +26,7 @@ import nautilus.game.arcade.gui.privateServer.button.OptionsButton;
 import nautilus.game.arcade.gui.privateServer.button.StartGameButton;
 import nautilus.game.arcade.gui.privateServer.button.StopGameButton;
 import nautilus.game.arcade.gui.privateServer.button.UnbanButton;
+import nautilus.game.arcade.gui.privateServer.button.WhitelistButton;
 
 public class MenuPage extends BasePage
 {
@@ -94,11 +95,14 @@ public class MenuPage extends BasePage
 			addButton(4 + 18, new ShopItem(Material.GOLD_SWORD, "Remove Admin", new String[]{}, 1, false), removeAdminButton);
 
 			KillButton killButton = new KillButton(getPlugin());
-			addButton(4 + 27, new ShopItem(Material.TNT, "Kill Private Server",
+			addButton(8 + 18, new ShopItem(Material.TNT, "Kill Private Server",
 					new String[]{ChatColor.RESET + C.cGray + "Shift-Right Click to Kill Private Server"}, 1, false), killButton);
 
 			GameVotingButton votingButton = new GameVotingButton(getPlugin(), getShop());
-			addButton(8 + 18, new ShopItem(Material.BOOKSHELF, "Game Voting", new String[]{}, 1, false), votingButton);
+			addButton(3 + 27, new ShopItem(Material.BOOKSHELF, "Game Voting", new String[]{}, 1, false), votingButton);
+
+			WhitelistButton whitelistButton = new WhitelistButton(getPlugin(), getShop());
+			addButton(5 + 27, new ShopItem(Material.PAPER, "Whitelisted Players", new String[]{}, 1, false), whitelistButton);
 		}
 
 		OptionsButton optionsButton = new OptionsButton(getPlugin(), getShop());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
index 8b7c5b0e0..1b2eebcc5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/OptionsPage.java
@@ -117,6 +117,8 @@ public class OptionsPage extends BasePage
 	private void toggleWhitelist()
 	{
 		_config.PlayerServerWhitelist = !_config.PlayerServerWhitelist;
+		if (_config.PlayerServerWhitelist == true)
+			_config.PublicServer = false;
 		refresh();
 	}
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index d2d0b4092..b17e0009e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -72,6 +72,7 @@ public class SetGamePage extends BasePage
 		allowedCats.add(GameCategory.SURVIVAL);
 		allowedCats.add(GameCategory.CHAMPIONS);
 		allowedCats.add(GameCategory.EXTRA);
+		allowedCats.add(GameCategory.TEAM_VARIANT);
 		
 		int gameSlot = 9;
 		for (GameCategory cat : _manager.getGames(getPlayer()).keySet())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java
index 0b23a5be6..4643fa21b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java
@@ -2,6 +2,7 @@ package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.entity.Player;
 
+import mineplex.core.common.util.F;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
@@ -12,7 +13,7 @@ import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
  * consent of William Burns. 2015.
  * 29/07/15
  */
-public class WhitelistedPage extends BasePage
+public class WhitelistedPage extends PlayerPage
 {
 	public WhitelistedPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
@@ -21,13 +22,24 @@ public class WhitelistedPage extends BasePage
 	}
 
 	@Override
-	protected void buildPage()
+	public boolean showPlayer(Player player)
 	{
-
+		if (getPlugin().GetGameHostManager().getWhitelist().contains(player.getName()))
+			return true;
+		return false;
 	}
 
-	private void addPlayerButton(Player p)
+	@Override
+	public void clicked(int slot, Player player)
 	{
+		getPlugin().GetGameHostManager().getWhitelist().remove(player.getName());
+		getPlugin().GetPortal().sendToHub(player, "You are no longer whitelisted.");
+		getPlayer().sendMessage(F.main("Whitelist", "§e" + player.getName() + " §7is no longer whitelisted."));
+	}
 
+	@Override
+	public String getDisplayString(Player player)
+	{
+		return "Click to remove from whitelist";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 6c8bb6276..3b5ccc485 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -109,10 +109,6 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.Build);
 		legendGames.add(GameType.UHC);
 		legendGames.add(GameType.MineStrike);
-		legendGames.add(GameType.SnowFight);
-		legendGames.add(GameType.Gravity);
-		legendGames.add(GameType.Barbarians);
-		legendGames.add(GameType.SmashDomination);
 		legendGames.add(GameType.Skywars);
 		// Team variants - Currently being remade.
 		/*
@@ -128,6 +124,13 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.MilkCow);
 		legendGames.add(GameType.SearchAndDestroy);
 		legendGames.add(GameType.ZombieSurvival);
+		legendGames.add(GameType.SurvivalGamesTeams);
+		legendGames.add(GameType.SkywarsTeams);
+		legendGames.add(GameType.SmashTeams);
+		legendGames.add(GameType.SnowFight);
+		legendGames.add(GameType.Gravity);
+		legendGames.add(GameType.Barbarians);
+		legendGames.add(GameType.SmashDomination);
 
 		//Config Defaults
 		if (Manager.GetHost() != null && Manager.GetHost().length() > 0)
@@ -223,6 +226,8 @@ public class GameHostManager implements Listener
 		Player p = event.getPlayer();
 		if (Manager.GetServerConfig().PlayerServerWhitelist){
 			if (!getWhitelist().contains(p.getName())){
+				if (_host == p)
+					return;
 				Manager.GetPortal().sendToHub(p, "You aren't on the whitelist of this Mineplex Private Server.");
 			}
 		}

From 2b3fec754f32baaca17003a5177f0fcdb22decde Mon Sep 17 00:00:00 2001
From: William Burns <william@williamburns.co.uk>
Date: Wed, 29 Jul 2015 14:25:38 +0100
Subject: [PATCH 073/113] Colour change cause colour!

---
 .../game/arcade/managers/GameHostManager.java | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 3b5ccc485..d8c11b81c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -190,31 +190,13 @@ public class GameHostManager implements Listener
 
 		if (_voteNotificationStage == 1)
 		{
-			UtilTextBottom.display("§e§l> §6§lUse §e§l/vote §6§lto vote for a game! §e§l<", UtilServer.getPlayers());
+			UtilTextBottom.display("§e§l> §e§lUse §6§l/vote §e§lto vote for a game! §e§l<", UtilServer.getPlayers());
 			_voteNotificationStage++;
 			return;
 		}
 		else if (_voteNotificationStage == 2)
 		{
-			UtilTextBottom.display("§a§l> §2§lUse §a§l/vote §2§lto vote for a game! §a§l<", UtilServer.getPlayers());
-			_voteNotificationStage++;
-			return;
-		}
-		else if (_voteNotificationStage == 3)
-		{
-			UtilTextBottom.display("§c§l> §4§lUse §c§l/vote §4§lto vote for a game! §c§l<", UtilServer.getPlayers());
-			_voteNotificationStage++;
-			return;
-		}
-		else if (_voteNotificationStage == 4)
-		{
-			UtilTextBottom.display("§b§l> §3§lUse §b§l/vote §3§lto vote for a game! §b§l<", UtilServer.getPlayers());
-			_voteNotificationStage++;
-			return;
-		}
-		else if (_voteNotificationStage == 5)
-		{
-			UtilTextBottom.display("§d§l> §5§lUse §d§l/vote §5§lto vote for a game! §d§l<", UtilServer.getPlayers());
+			UtilTextBottom.display("§6§l> §6§lUse §e§l/vote §6§lto vote for a game! §6§l<", UtilServer.getPlayers());
 			_voteNotificationStage = 1;
 			return;
 		}

From 51cef645549e358da6640d0b8191c19128489813 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 15:29:12 +0200
Subject: [PATCH 074/113] improved text

---
 .../src/nautilus/game/arcade/managers/GameHostManager.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index d8c11b81c..7f66556bd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -190,13 +190,13 @@ public class GameHostManager implements Listener
 
 		if (_voteNotificationStage == 1)
 		{
-			UtilTextBottom.display("§e§l> §e§lUse §6§l/vote §e§lto vote for a game! §e§l<", UtilServer.getPlayers());
+			UtilTextBottom.display(C.cWhite + "Type " + C.cGreen +  "/vote" + C.cWhite + "to vote for next game", UtilServer.getPlayers());
 			_voteNotificationStage++;
 			return;
 		}
 		else if (_voteNotificationStage == 2)
 		{
-			UtilTextBottom.display("§6§l> §6§lUse §e§l/vote §6§lto vote for a game! §6§l<", UtilServer.getPlayers());
+			UtilTextBottom.display(C.cWhite + "Type " + C.cYellow +  "/vote" + C.cWhite + "to vote for next game", UtilServer.getPlayers());
 			_voteNotificationStage = 1;
 			return;
 		}

From ab2c865ab313055eed17c92812ee8b7a2700a58c Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 15:48:12 +0200
Subject: [PATCH 075/113] better colors

---
 .../src/nautilus/game/arcade/managers/GameHostManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 7f66556bd..84e4f9391 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -182,7 +182,7 @@ public class GameHostManager implements Listener
 	@EventHandler
 	public void voteNotification(UpdateEvent e)
 	{
-		if (e.getType() != UpdateType.FASTER)
+		if (e.getType() != UpdateType.FAST)
 			return;
 
 		if (!_voteInProgress)
@@ -190,13 +190,13 @@ public class GameHostManager implements Listener
 
 		if (_voteNotificationStage == 1)
 		{
-			UtilTextBottom.display(C.cWhite + "Type " + C.cGreen +  "/vote" + C.cWhite + "to vote for next game", UtilServer.getPlayers());
+			UtilTextBottom.display(C.cYellow + C.Bold + "Type " + C.cGold +  C.Bold + "/vote" + C.cYellow + C.Bold + " to vote for next game", UtilServer.getPlayers());
 			_voteNotificationStage++;
 			return;
 		}
 		else if (_voteNotificationStage == 2)
 		{
-			UtilTextBottom.display(C.cWhite + "Type " + C.cYellow +  "/vote" + C.cWhite + "to vote for next game", UtilServer.getPlayers());
+			UtilTextBottom.display(C.cGold + C.Bold + "Type " + C.cYellow +  C.Bold + "/vote" + C.cGold + C.Bold + " to vote for next game", UtilServer.getPlayers());
 			_voteNotificationStage = 1;
 			return;
 		}

From 9c5ca750cfe677e7689f2e978e400e3e504e92d0 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Wed, 29 Jul 2015 15:53:45 +0200
Subject: [PATCH 076/113] Improving /e mob command and implementing other
 commands.

---
 .../arcade/game/games/event/EventModule.java  | 233 +++++++++++++++++-
 1 file changed, 229 insertions(+), 4 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
index bb9725b2f..05d3129cd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
@@ -26,6 +26,7 @@ import nautilus.game.arcade.ArcadeManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
@@ -42,6 +43,7 @@ import org.bukkit.entity.Skeleton.SkeletonType;
 import org.bukkit.entity.Villager.Profession;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -56,12 +58,23 @@ public class EventModule extends MiniPlugin
 	private NautHashMap<PotionEffectType, Long> _potionEffectsDuration = new NautHashMap<>();
 	private NautHashMap<PotionEffectType, Integer> _potionEffectsMult = new NautHashMap<>();
 	
+	private boolean _mobGriefing = true;
+	
 	public EventModule(ArcadeManager manager, JavaPlugin plugin)
 	{
 		super("EventModule", plugin);
 		Manager = manager;
 	}
 	
+	@EventHandler
+	public void mobGriefing(EntityChangeBlockEvent event)
+	{
+		if(!_mobGriefing)
+		{
+			event.setCancelled(true);
+		}
+	}
+	
 	@EventHandler
 	public void setHostDebug(PlayerCommandPreprocessEvent event)
 	{
@@ -137,6 +150,9 @@ public class EventModule extends MiniPlugin
 		UtilPlayer.message(player, F.value("/e hunger <-1 to 20>", "Locks Players Hunger"));
 		UtilPlayer.message(player, F.value("/e item drop", "Toggles Item Drop"));
 		UtilPlayer.message(player, F.value("/e item pickup", "Toggles Item Pickup"));
+		UtilPlayer.message(player, F.value("/e blockplacecreative", "Toggles Block Placing in Creative (On/Off)"));
+		UtilPlayer.message(player, F.value("/e blockbreakcreative", "Toggles Block Breaking in Creative (On/Off)"));
+		UtilPlayer.message(player, F.value("/e blockplace", "Toggles Block Placing (On/Off)"));
 		UtilPlayer.message(player, F.value("/e blockplace", "Toggles Block Placing (On/Off)"));
 		UtilPlayer.message(player, F.value("/e blockplace whitelist <add/remove/list/clear> <id>", ""));
 		UtilPlayer.message(player, F.value("/e blockplace blacklist <add/remove/list/clear> <id>", ""));
@@ -144,9 +160,10 @@ public class EventModule extends MiniPlugin
 		UtilPlayer.message(player, F.value("/e blockbreak whitelist <add/remove/list/clear> <id>", ""));
 		UtilPlayer.message(player, F.value("/e blockbreak blacklist <add/remove/list/clear> <id>", ""));
 		UtilPlayer.message(player, F.value("/e time <-1 to 24000>", "Sets World Time"));
-		UtilPlayer.message(player, F.value("/e joiningame", "toggles Join In Process for games"));
-		UtilPlayer.message(player, F.value("/e deathout", "toggles Deathout in games"));
-		UtilPlayer.message(player, F.value("/e quitout", "toggles Quitout in games"));
+		//UtilPlayer.message(player, F.value("/e joiningame", "toggles Join In Process for games"));
+		//UtilPlayer.message(player, F.value("/e deathout", "toggles Deathout in games"));
+		//UtilPlayer.message(player, F.value("/e quitout", "toggles Quitout in games"));
+		UtilPlayer.message(player, F.value("/e mobgriefing", "toggles mobgriefing in games"));
 	}
 
 	//Command Handler
@@ -308,7 +325,7 @@ public class EventModule extends MiniPlugin
 		{
 			commandTime(event.getPlayer(), args);
 		}
-		else if(args[0].equalsIgnoreCase("joiningame"))
+		/*else if(args[0].equalsIgnoreCase("joiningame"))
 		{
 			commandSpectators(event.getPlayer(), args);
 		}
@@ -319,6 +336,18 @@ public class EventModule extends MiniPlugin
 		else if(args[0].equalsIgnoreCase("quitout"))
 		{
 			commandQuitOut(event.getPlayer(), args);
+		}*/
+		else if(args[0].equalsIgnoreCase("blockplacecreative"))
+		{
+			commandBlockPlaceInCreative(event.getPlayer(), args);
+		}
+		else if(args[0].equalsIgnoreCase("blockbreakcreative"))
+		{
+			commandBlockBreakInCreative(event.getPlayer(), args);
+		}
+		else if(args[0].equalsIgnoreCase("mobgriefing"))
+		{
+			commandMobGriefing(event.getPlayer(), args);
 		}
 	}
 
@@ -333,6 +362,8 @@ public class EventModule extends MiniPlugin
 		UtilPlayer.message(player, F.value("Hunger Set", Manager.GetGame().HungerSet+""));
 		UtilPlayer.message(player, F.value("Item Pickup", F.tf(Manager.GetGame().ItemPickup)));
 		UtilPlayer.message(player, F.value("Item Drop", F.tf(Manager.GetGame().ItemDrop)));
+		UtilPlayer.message(player, F.value("Block Place Creative", F.tf(Manager.GetGame().BlockPlaceCreative)));
+		UtilPlayer.message(player, F.value("Block Break Creative", F.tf(Manager.GetGame().BlockBreakCreative)));
 		UtilPlayer.message(player, F.value("Block Place", F.tf(Manager.GetGame().BlockPlace)));
 		UtilPlayer.message(player, F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow, true)));
 		UtilPlayer.message(player, F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny, true)));
@@ -340,6 +371,28 @@ public class EventModule extends MiniPlugin
 		UtilPlayer.message(player, F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow, true)));
 		UtilPlayer.message(player, F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny, true)));
 		UtilPlayer.message(player, F.value("Time Set", Manager.GetGame().WorldTimeSet+""));
+		UtilPlayer.message(player, F.value("Mob griefing", F.tf(_mobGriefing)));
+	}
+	
+	private void commandBlockBreakInCreative(Player player, String[] args)
+	{
+		Manager.GetGame().BlockBreakCreative = !Manager.GetGame().BlockBreakCreative;
+		
+		UtilPlayer.message(player, F.main("Settings", "BlockBreakCreative: " + F.tf(Manager.GetGame().BlockBreakCreative)));
+	}
+	
+	private void commandBlockPlaceInCreative(Player player, String[] args)
+	{
+		Manager.GetGame().BlockPlaceCreative = !Manager.GetGame().BlockPlaceCreative;
+		
+		UtilPlayer.message(player, F.main("Settings", "BlockPlaceCreative: " + F.tf(Manager.GetGame().BlockPlaceCreative)));
+	}
+	
+	private void commandMobGriefing(Player player, String[] args)
+	{
+		_mobGriefing = !_mobGriefing;
+		
+		UtilPlayer.message(player, F.main("Settings", "Mob Griefing: " + F.tf(_mobGriefing)));
 	}
 
 	private void commandBlockPlace(Player player, String[] args, boolean whitelist, String command)
@@ -1192,6 +1245,178 @@ public class EventModule extends MiniPlugin
 					}
 					argHandle.add(arg);	
 				}
+				else if (arg.toLowerCase().charAt(0) == 'h' && arg.length() > 1)
+				{
+					try
+					{
+						String health = "";
+
+						for (char c : arg.substring(1, arg.length()).toCharArray())
+						{
+							if (c != '_')
+								health += c;
+							else
+								health += " ";
+						}
+						
+						double healthint = Double.parseDouble(health);
+						
+						for (Entity ent : entSet)
+						{
+							if (ent instanceof CraftLivingEntity)
+							{
+								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
+								cEnt.setMaxHealth(healthint);
+								cEnt.setHealth(healthint);
+							}
+						}
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Health", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);	
+				}
+				else if (arg.toLowerCase().charAt(0) == 'e' && arg.length() > 1)
+				{
+					try
+					{
+						String effect = "";
+
+						for (char c : arg.substring(1, arg.length()).toCharArray())
+						{
+							if (c != '_')
+								effect += c;
+							else
+								effect += " ";
+						}
+						
+						PotionEffectType potionType = PotionEffectType.getByName(effect);
+						
+						if (potionType == null)
+						{
+							UtilPlayer.message(caller, F.main("Effect", "Invalid Effect Type: " + args[2]));
+							UtilPlayer.message(caller, F.value("Valid Types", "http://minecraft.gamepedia.com/Status_effect"));
+							return;
+						}	
+						
+						for (Entity ent : entSet)
+						{
+							if (ent instanceof CraftLivingEntity)
+							{
+								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
+								cEnt.addPotionEffect(new PotionEffect(potionType, Integer.MAX_VALUE, 0));
+							}
+						}
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("PotionEffect", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);	
+				}
+				else if (arg.toLowerCase().charAt(0) == 'i' && arg.length() > 1)
+				{
+					try
+					{
+						String item = "";
+
+						for (char c : arg.substring(1, arg.length()).toCharArray())
+						{
+							item += c;
+						}
+						
+						Material mat = Material.getMaterial(item);
+						
+						for (Entity ent : entSet)
+						{
+							if (ent instanceof CraftLivingEntity)
+							{
+								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
+								cEnt.getEquipment().setItemInHand(new ItemStack(mat));
+							}
+						}
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Item", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);	
+				}
+				else if (arg.toLowerCase().charAt(0) == 'a' && arg.length() > 1)
+				{
+					try
+					{
+						String armor = "";
+
+						for (char c : arg.substring(1, arg.length()).toCharArray())
+						{
+							if (c != '_')
+								armor += c;
+							else
+								armor += " ";
+						}
+						
+						ItemStack head = null;
+						ItemStack chest = null;
+						ItemStack leggings = null;
+						ItemStack boots = null;
+						
+						
+						if(armor.equalsIgnoreCase("leather"))
+						{
+							head = new ItemStack(Material.LEATHER_HELMET);
+							chest = new ItemStack(Material.LEATHER_CHESTPLATE);
+							leggings = new ItemStack(Material.LEATHER_LEGGINGS);
+							boots = new ItemStack(Material.LEATHER_BOOTS);
+						}
+						if(armor.equalsIgnoreCase("gold"))
+						{
+							head = new ItemStack(Material.GOLD_HELMET);
+							chest = new ItemStack(Material.GOLD_CHESTPLATE);
+							leggings = new ItemStack(Material.GOLD_LEGGINGS);
+							boots = new ItemStack(Material.GOLD_BOOTS);
+						}
+						if(armor.equalsIgnoreCase("chain"))
+						{
+							head = new ItemStack(Material.CHAINMAIL_HELMET);
+							chest = new ItemStack(Material.CHAINMAIL_CHESTPLATE);
+							leggings = new ItemStack(Material.CHAINMAIL_LEGGINGS);
+							boots = new ItemStack(Material.CHAINMAIL_BOOTS);
+						}
+						if(armor.equalsIgnoreCase("iron"))
+						{
+							head = new ItemStack(Material.IRON_HELMET);
+							chest = new ItemStack(Material.IRON_CHESTPLATE);
+							leggings = new ItemStack(Material.IRON_LEGGINGS);
+							boots = new ItemStack(Material.IRON_BOOTS);
+						}
+						if(armor.equalsIgnoreCase("diamond"))
+						{
+							head = new ItemStack(Material.DIAMOND_HELMET);
+							chest = new ItemStack(Material.DIAMOND_CHESTPLATE);
+							leggings = new ItemStack(Material.DIAMOND_LEGGINGS);
+							boots = new ItemStack(Material.DIAMOND_BOOTS);
+						}
+						
+						for (Entity ent : entSet)
+						{
+							if (ent instanceof CraftLivingEntity)
+							{
+								CraftLivingEntity cEnt = (CraftLivingEntity)ent;
+								cEnt.getEquipment().setHelmet(head);
+								cEnt.getEquipment().setChestplate(chest);
+								cEnt.getEquipment().setLeggings(leggings);
+								cEnt.getEquipment().setBoots(boots);
+							}
+						}
+					}
+					catch (Exception e)
+					{
+						UtilPlayer.message(caller, F.desc("Armor", "Invalid [" + arg + "] on " + type.name()));
+					}
+					argHandle.add(arg);	
+				}
 			}
 			for (String arg : argHandle)
 				argSet.remove(arg);

From b5d3ad0e0d0f5425ad8ce53acf6cba972935e8fa Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Wed, 29 Jul 2015 16:05:43 +0200
Subject: [PATCH 077/113] Adding perks

---
 .../arcade/kit/perks/PerkWitherAttack.java    | 38 ++++++++-----------
 .../arcade/kit/perks/PerkWitherMinion.java    |  2 +-
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java
index 06a5c5b47..8609bcaac 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java
@@ -2,42 +2,21 @@ package nautilus.game.arcade.kit.perks;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.WitherSkull;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.util.Vector;
-
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
-import mineplex.core.common.util.UtilAction;
-import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -45,6 +24,19 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.kit.Perk;
 import nautilus.game.arcade.kit.perks.data.IBlockRestorer;
 
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.WitherSkull;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
 public class PerkWitherAttack extends Perk
 {
 	private ArrayList<WitherSkull> _active = new ArrayList<WitherSkull>();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMinion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMinion.java
index d58ec59ad..c0131bc41 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMinion.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMinion.java
@@ -76,7 +76,7 @@ public class PerkWitherMinion extends Perk
 
 		Manager.GetGame().CreatureAllowOverride = true;
 		
-		for (int i=0 ; i<3 ; i++)
+		for (int i=0 ; i<2 ; i++)
 		{
 			Skeleton skel = player.getWorld().spawn(player.getEyeLocation(), Skeleton.class);
 			_ents.add(skel);

From f714bfbb0f35646e6c23d8761d3bf83d57ca76c0 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Wed, 29 Jul 2015 16:06:43 +0200
Subject: [PATCH 078/113] Adding testing achievement lol

---
 .../stats/WitherAssaultReviveTracker.java     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WitherAssaultReviveTracker.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WitherAssaultReviveTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WitherAssaultReviveTracker.java
new file mode 100644
index 000000000..d2e52bbd1
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WitherAssaultReviveTracker.java
@@ -0,0 +1,25 @@
+package nautilus.game.arcade.stats;
+
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.games.wither.events.HumanReviveEvent;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+public class WitherAssaultReviveTracker extends StatTracker<Game>
+{
+	public WitherAssaultReviveTracker(Game game)
+	{
+		super(game);
+	}
+	
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void onCombatDeath(HumanReviveEvent event)
+	{
+		if (getGame().GetState() != Game.GameState.Live)
+			return;
+
+		addStat(event.getPlayer(), "WitherHeal", 1, false, false);
+	}
+
+}

From e47a343e2e16209e4cd336f4033da9140998d856 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 16:20:49 +0200
Subject: [PATCH 079/113] added mode for team games

---
 .../game/arcade/game/games/skywars/SoloSkywars.java         | 5 +++++
 .../game/arcade/game/games/skywars/TeamSkywars.java         | 5 +++++
 .../game/arcade/game/games/smash/SoloSuperSmash.java        | 5 +++++
 .../nautilus/game/arcade/game/games/smash/SuperSmash.java   | 6 ------
 .../game/arcade/game/games/smash/TeamSuperSmash.java        | 6 ++++++
 .../arcade/game/games/survivalgames/SoloSurvivalGames.java  | 5 +++++
 .../arcade/game/games/survivalgames/TeamSurvivalGames.java  | 5 +++++
 7 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
index 8da685ceb..7d5cb0530 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
@@ -170,4 +170,9 @@ public class SoloSkywars extends Skywars
 		return losers;
 	}
 
+	@Override
+	public String GetMode()
+	{
+		return "Last Man Standing";
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 53c7148cf..0818ebd76 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -468,4 +468,9 @@ public class TeamSkywars extends Skywars
 		return null;
 	}
 
+	@Override
+	public String GetMode()
+	{
+		return "Last Team Standing";
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
index 493fd7e24..f0678bd98 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
@@ -154,4 +154,9 @@ public class SoloSuperSmash extends SuperSmash
 		return losers;
 	}
 
+	@Override
+	public String GetMode()
+	{
+		return "Solo Deathmatch";
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
index 67fc55802..6e255aea9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
@@ -491,10 +491,4 @@ public abstract class SuperSmash extends Game
 		int amount = Math.max(1, (int)(event.GetDamage()/2));
 		UtilPlayer.hunger(damager, amount);
 	}
-
-	public String GetMode()
-	{
-		return "Deathmatch";
-	}
-	
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 6aa1dbcef..4508aa2ec 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -413,4 +413,10 @@ public class TeamSuperSmash extends SuperSmash
 		
 		return null;
 	}
+	
+	@Override
+	public String GetMode()
+	{
+		return "Team Deathmatch";
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
index c036edcbb..923ab806b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
@@ -173,4 +173,9 @@ public class SoloSurvivalGames extends SurvivalGames
 		return losers;
 	}
 
+	@Override
+	public String GetMode()
+	{
+		return "Last Man Standing";
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 75aede149..996ee40be 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -438,4 +438,9 @@ public class TeamSurvivalGames extends SurvivalGames
 		return null;
 	}
 	
+	@Override
+	public String GetMode()
+	{
+		return "Last Team Standing";
+	}
 }

From 862cdae14f33102affe9fed7e1fcdd162471dc5b Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 16:32:11 +0200
Subject: [PATCH 080/113] team modes

---
 .../Mineplex.Core/src/mineplex/core/game/GameDisplay.java   | 6 +++---
 .../game/arcade/game/games/skywars/SoloSkywars.java         | 2 +-
 .../game/arcade/game/games/skywars/TeamSkywars.java         | 2 +-
 .../game/arcade/game/games/smash/SoloSuperSmash.java        | 2 +-
 .../game/arcade/game/games/smash/TeamSuperSmash.java        | 2 +-
 .../arcade/game/games/survivalgames/SoloSurvivalGames.java  | 2 +-
 .../arcade/game/games/survivalgames/TeamSurvivalGames.java  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index a4c8a7d62..91c3ae291 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -51,7 +51,7 @@ public enum GameDisplay
 	SquidShooter("Squid Shooter", Material.FIREWORK_CHARGE, (byte)0, GameCategory.ARCADE, 43),
 	Stacker("Super Stacker", Material.BOWL, (byte)0, GameCategory.ARCADE, 42),
 	SurvivalGames("Survival Games", Material.IRON_SWORD, (byte)0, GameCategory.SURVIVAL, 22),
-	SurvivalGamesTeams("Survival Games Teams", Material.IRON_SWORD, (byte)0, GameCategory.TEAM_VARIANT, 23),
+	SurvivalGamesTeams("Survival Games", Material.IRON_SWORD, (byte)0, GameCategory.TEAM_VARIANT, 23),
 	Tug("Tug of Wool", Material.WHEAT, (byte)0, GameCategory.ARCADE, 44),
 	TurfWars("Turf Wars", Material.STAINED_CLAY, (byte)14, GameCategory.ARCADE, 45),
 	UHC("Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0, GameCategory.SURVIVAL, 46),
@@ -61,8 +61,8 @@ public enum GameDisplay
 
 	Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
 	Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
-	Skywars("Skywars", Material.FEATHER, (byte) 0, GameCategory.SURVIVAL, 52),
-	SkywarsTeams("Skywars Teams", Material.FEATHER, (byte)5, GameCategory.TEAM_VARIANT, 53),
+	Skywars("Skywars", "Skywars", Material.FEATHER, (byte) 0, GameCategory.SURVIVAL, 52),
+	SkywarsTeams("Skywars Teams", "Skywars",Material.FEATHER, (byte)5, GameCategory.TEAM_VARIANT, 53),
 
 	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
index 7d5cb0530..d5262599d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
@@ -173,6 +173,6 @@ public class SoloSkywars extends Skywars
 	@Override
 	public String GetMode()
 	{
-		return "Last Man Standing";
+		return "Solo Mode";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 0818ebd76..4a94fd480 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -471,6 +471,6 @@ public class TeamSkywars extends Skywars
 	@Override
 	public String GetMode()
 	{
-		return "Last Team Standing";
+		return "Team Mode";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
index f0678bd98..b9ba7a26b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java
@@ -157,6 +157,6 @@ public class SoloSuperSmash extends SuperSmash
 	@Override
 	public String GetMode()
 	{
-		return "Solo Deathmatch";
+		return "Solo Mode";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 4508aa2ec..68ad4e633 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -417,6 +417,6 @@ public class TeamSuperSmash extends SuperSmash
 	@Override
 	public String GetMode()
 	{
-		return "Team Deathmatch";
+		return "Team Mode";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
index 923ab806b..8085bf2ed 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SoloSurvivalGames.java
@@ -176,6 +176,6 @@ public class SoloSurvivalGames extends SurvivalGames
 	@Override
 	public String GetMode()
 	{
-		return "Last Man Standing";
+		return "Solo Mode";
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 996ee40be..128997b9e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -441,6 +441,6 @@ public class TeamSurvivalGames extends SurvivalGames
 	@Override
 	public String GetMode()
 	{
-		return "Last Team Standing";
+		return "Team Mode";
 	}
 }

From 1a27dea32cbc89dbd92ef6b36843e9db0990f645 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Wed, 29 Jul 2015 16:35:57 +0200
Subject: [PATCH 081/113] Why was these not added...

---
 .../kit/perks/PerkWitherCompassScent.java     | 169 ++++++++++++++++++
 .../kit/perks/PerkWitherMedicRefill.java      |  73 ++++++++
 2 files changed, 242 insertions(+)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherCompassScent.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMedicRefill.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherCompassScent.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherCompassScent.java
new file mode 100644
index 000000000..2326d1380
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherCompassScent.java
@@ -0,0 +1,169 @@
+package nautilus.game.arcade.kit.perks;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilGear;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilParticle.ParticleType;
+import mineplex.core.common.util.UtilParticle.ViewDist;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.hologram.Hologram;
+import mineplex.core.hologram.Hologram.HologramTarget;
+import mineplex.core.recharge.Recharge;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
+
+public class PerkWitherCompassScent extends Perk
+{
+	public PerkWitherCompassScent()
+	{
+		super("Smell Humans", new String[]
+				{
+				C.cYellow + "Right-Click" + C.cGray + " with a compass to use " + C.cGreen + "Wither Scent"
+				});
+	}
+	
+	@EventHandler
+	public void compassRightClick(PlayerInteractEvent event)
+	{
+		if(event.isCancelled())
+			return;
+		
+		if(!UtilEvent.isAction(event, ActionType.R))
+			return;
+		
+		if (!UtilGear.isMat(event.getPlayer().getItemInHand(), Material.COMPASS))
+			return;
+
+		if(!Kit.HasKit(event.getPlayer()))
+			return;
+		
+		if (!Recharge.Instance.use(event.getPlayer(), GetName(), 30*1000, true, true))
+			return;
+		
+		event.setCancelled(true);
+		Player player = event.getPlayer();
+		
+		// Code from Wizards changed to WitherGame:
+		Location loc = player.getEyeLocation().subtract(0, 1, 0);
+
+		final ArrayList<Integer[]> colors = new ArrayList<Integer[]>();
+
+		for (int x = -1; x <= 1; x++)
+		{
+
+			for (int y = -1; y <= 1; y++)
+			{
+
+				for (int z = -1; z <= 1; z++)
+				{
+					colors.add(new Integer[]
+						{
+								x, y, z
+						});
+				}
+			}
+		}
+
+		Collections.shuffle(colors);
+
+		for (Player enemy : Manager.GetGame().GetPlayers(true))
+		{
+			if (enemy == player)
+			{
+				continue;
+			}
+			
+			if(Manager.GetGame().GetTeam(enemy).GetName().contentEquals("Withers"))
+			{
+				continue;
+			}
+
+			final double playerDist = Math.min(7, UtilMath.offset(enemy, player));
+
+			final Vector traj = UtilAlg.getTrajectory(player.getLocation(), enemy.getEyeLocation()).multiply(0.1);
+
+			final Hologram hologram = new Hologram(Manager.GetGame().getArcadeManager().getHologramManager(), loc.clone().add(0, 0.3, 0)
+					.add(traj.clone().normalize().multiply(playerDist)), enemy.getName());
+
+			hologram.setHologramTarget(HologramTarget.WHITELIST);
+			hologram.addPlayer(player);
+
+			hologram.start();
+
+			final Location location = loc.clone();
+			final Integer[] ints = colors.remove(0);
+
+			new BukkitRunnable()
+			{
+				int dist;
+				int tick;
+				HashMap<Location, Integer> locations = new HashMap<Location, Integer>();
+
+				public void run()
+				{
+					tick++;
+
+					Iterator<Entry<Location, Integer>> itel = locations.entrySet().iterator();
+
+					while (itel.hasNext())
+					{
+						Entry<Location, Integer> entry = itel.next();
+
+						if ((entry.getValue() + tick) % 3 == 0)
+						{
+							// Colored redstone dust
+							UtilParticle.PlayParticle(ParticleType.RED_DUST, entry.getKey(), ints[0], ints[1], ints[2], 1, 0,
+									ViewDist.LONG, UtilServer.getPlayers());
+						}
+
+						if (entry.getValue() < tick)
+						{
+							itel.remove();
+						}
+					}
+
+					if (dist <= playerDist * 10)
+					{
+						for (int a = 0; a < 2; a++)
+						{
+							// Colored redstone dust
+							UtilParticle.PlayParticle(ParticleType.RED_DUST, location, ints[0], ints[1], ints[2], 1, 0,
+									ViewDist.LONG, UtilServer.getPlayers());
+
+							locations.put(location.clone(), tick + 50);
+
+							location.add(traj);
+							dist++;
+						}
+					}
+					else if (locations.isEmpty())
+					{
+						hologram.stop();
+						cancel();
+					}
+				}
+			}.runTaskTimer(Manager.GetGame().getArcadeManager().getPlugin(), 0, 0);
+		}
+
+		player.playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 1.5F, 1);
+
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMedicRefill.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMedicRefill.java
new file mode 100644
index 000000000..06a140e6c
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherMedicRefill.java
@@ -0,0 +1,73 @@
+package nautilus.game.arcade.kit.perks;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.kit.Perk;
+
+public class PerkWitherMedicRefill extends Perk
+{
+	private int _max = 0;
+	private int _time = 0;
+
+	public PerkWitherMedicRefill(int timeInSeconds, int max)
+	{
+		super("Healing Hands", new String[]
+				{
+				C.cGray + "Receive 1 healing bottle every " + timeInSeconds + " seconds if you're inventory is clearned from a bottle.",
+				});
+		
+		this._time = timeInSeconds;
+		this._max = max;
+		
+	}
+	
+	@EventHandler
+	public void bottleRefill(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+
+		for (Player player : UtilServer.getPlayers())
+		{
+			if (Manager.isSpectator(player))
+				continue;
+			
+			if (!Kit.HasKit(player))
+				continue;
+
+			if (!Manager.GetGame().IsAlive(player))
+				continue;
+
+			if (!Recharge.Instance.use(player, GetName(), _time * 1000, false, false))
+				continue;
+
+			//Add
+			ItemStack potion = new ItemStack(Material.POTION, 1, (short)16429); // 16422
+			PotionMeta potionMeta = (PotionMeta)potion.getItemMeta();
+			potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion");
+			potion.setItemMeta(potionMeta);
+			
+			if (UtilInv.contains(player, "Revival Potion", Material.POTION, potion.getData().getData(), _max))
+				continue;
+
+			player.getInventory().addItem(potion);
+
+			player.playSound(player.getLocation(), Sound.ITEM_PICKUP, 2f, 1f);
+		}
+	}
+
+}

From 1004203b34d6b900943ee28ca401ee8e16f25566 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 16:48:49 +0200
Subject: [PATCH 082/113] fixed up some merge issues

---
 .../game/arcade/managers/GameHostManager.java | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index fd34b3471..fab9c7138 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -391,7 +391,7 @@ public class GameHostManager implements Listener
 		}
 		msg = msg.trim();
 
-		Bukkit.broadcastMessage("�6�l" + event.getPlayer().getName() + " �e" + msg);
+		Bukkit.broadcastMessage("�6�l" + event.getPlayer().getName() + " �e" + msg);
 	}
 
 	@EventHandler
@@ -680,29 +680,7 @@ public class GameHostManager implements Listener
 		else
 			return 4;
 	}
-	
-	@EventHandler
-	public void setHostDebug(PlayerCommandPreprocessEvent event)
-	{
-		if (!event.getPlayer().isOp())
-			return;
 		
-		if (!event.getMessage().toLowerCase().startsWith("/sethost "))
-			return;
-		
-		Manager.GetServerConfig().HostName = event.getMessage().split(" ")[1];
-
-		event.getPlayer().sendMessage("Set host to: " + event.getMessage().split(" ")[1]);
-
-		_host = Bukkit.getPlayerExact(Manager.GetServerConfig().HostName);
-		if (_host != null)
-			_hostRank = Manager.GetClients().Get(_host).GetRank();
-		
-		setDefaultConfig();
-		
-		event.setCancelled(true);
-	}
-	
 	@EventHandler
 	public void setEventGame(PlayerCommandPreprocessEvent event)
 	{
@@ -810,4 +788,25 @@ public class GameHostManager implements Listener
 	{
 		return _voteInProgress;
 	}
+	
+	public Rank getHostRank()
+	{
+		return _hostRank;
+	}
+	
+	public void setHostRank(Rank rank)
+	{
+		_hostRank = rank;
+	}
+	
+	public Player getHost()
+	{
+		return _host;
+	}
+	
+	public void setHost(Player player)
+	{
+		_host = player;
+	}
+	
 }

From 0e55ce1879b1aca0a63f72612d8cb9145cb76473 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 16:54:30 +0200
Subject: [PATCH 083/113] removed old hint

---
 .../src/nautilus/game/arcade/game/games/wither/WitherGame.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
index b9190ee2e..2e3cf0d85 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
@@ -140,7 +140,6 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 
 		_help = new String[]
 		{
-			"This game will soon not be under development anymore ;)",
 			"Blocks placed by an Editor can be passed by other humans by " + C.cDGreen + "Right-clicking the block",
 			"Withers are too powerful to be killed. Hiding is the only option!",
 			"Medics are a valuable asset. Stick with them and keep them safe!",

From be910cced9d4a2c9ae2235ff32ca9f77cdfb1692 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 17:00:36 +0200
Subject: [PATCH 084/113] gamemode color change

---
 .../src/nautilus/game/arcade/managers/GameLobbyManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index b7246e6f5..3eed707a6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -867,9 +867,9 @@ public class GameLobbyManager implements Listener, IPacketHandler
 		WriteGameLine(game.GetType().GetLobbyName(), 0, 159, (byte)14);
 		
 		if (game.GetMode() == null)
-			WriteGameLine("      ", 1, 159, (byte)14);
+			WriteGameLine("      ", 1, 159, (byte)1);
 		else
-			WriteGameLine(game.GetMode(), 1, 159, (byte)14);	
+			WriteGameLine(game.GetMode(), 1, 159, (byte)1);	
 		
 		DisplayWaiting();
 		CreateKits(game);

From 97a144150b34f7b1682259d3bbafc70a7c73c7c8 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Wed, 29 Jul 2015 21:51:18 +0200
Subject: [PATCH 085/113] fixed an NPE that was causing games not to end in MS

---
 .../src/mineplex/core/recharge/Recharge.java  | 21 +++++++++++++++++++
 .../game/games/minestrike/MineStrike.java     |  9 +-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
index 100b63432..c5f4633de 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
@@ -1,6 +1,7 @@
 package mineplex.core.recharge;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.bukkit.entity.Player;
@@ -218,6 +219,26 @@ public class Recharge extends MiniPlugin
 	{
 		_recharge.put(player.getName(), new NautHashMap<String, RechargeData>());
 	}
+	
+	public void Reset(Player player, String stringContains) 
+	{
+		NautHashMap<String, RechargeData> data = _recharge.get(player.getName());
+		
+		if (data == null)
+			return;
+		
+		Iterator<String> rechargeIter = data.keySet().iterator();
+		
+		while (rechargeIter.hasNext())
+		{
+			String key = rechargeIter.next();
+			
+			if (key.toLowerCase().contains(stringContains.toLowerCase()))
+			{
+				rechargeIter.remove();
+			}
+		}
+	}
 
 	public void debug(Player player, String ability)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
index 45ec44424..010eaf74c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
@@ -1927,14 +1927,7 @@ public class MineStrike extends TeamGame
 		{
 			player.playSound(player.getLocation(), Sound.LEVEL_UP, 1f, 1f);
 			
-			//Clear reloading things
-			for (String recharge : Recharge.Instance.Get(player).keySet())
-			{
-				if (!recharge.toLowerCase().contains("reload"))
-					continue;
-				
-				Recharge.Instance.recharge(player, recharge);
-			}
+			Recharge.Instance.Reset(player, "reload");
 		}
 
 		UtilTextMiddle.display(null, winnerLine, 20, 120, 20);

From de4d0a7dc30169ad6c8306ac899a6a2e59b5da6f Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Thu, 30 Jul 2015 02:33:06 +0200
Subject: [PATCH 086/113] Fixing needler, projectiles in SW and "Banannas...".

---
 .../arcade/game/games/skywars/Skywars.java    | 24 +++++++++++++++++++
 .../game/games/skywars/TeamSkywars.java       |  2 +-
 .../game/games/smash/TeamSuperSmash.java      |  2 +-
 .../survivalgames/TeamSurvivalGames.java      |  2 +-
 .../game/arcade/kit/perks/PerkNeedler.java    |  5 +++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index 705ee46a1..8a3dec9c4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -83,11 +83,13 @@ import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.ItemDespawnEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
@@ -962,6 +964,9 @@ public abstract class Skywars extends Game
 		if (event.GetDamage() >= 1)
 			return;
 
+		if(GetTeam(event.GetDamagerPlayer(true)) == GetTeam(event.GetDamageePlayer()))
+			return;
+		
 		if (event.GetProjectile() instanceof Egg || event.GetProjectile() instanceof Snowball)
 		{
 			event.SetCancelled("Egg/Snowball");
@@ -982,6 +987,25 @@ public abstract class Skywars extends Game
 			event.GetDamageeEntity().setVelocity(vel);
 		}
 	}
+	
+	@EventHandler
+	public void projectile(EntityDamageByEntityEvent event)
+	{
+		if(event.getDamager() instanceof Snowball || event.getDamager() instanceof Egg || event.getDamager() instanceof EnderPearl)
+		{
+			Projectile prj = (Projectile) event.getDamager();
+			if(prj.getShooter() instanceof Player)
+			{
+				if(event.getEntity() instanceof Player)
+				{
+					if(GetTeam((Player) prj.getShooter()) == GetTeam((Player) event.getEntity()))
+					{
+						event.setCancelled(true);
+					}
+				}
+			}
+		}
+	}
 
 	private void fillChest(Player looter, Block block)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 53c7148cf..d93324d33 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -134,7 +134,7 @@ public class TeamSkywars extends Skywars
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Banana", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index 6aa1dbcef..6065d2f60 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -153,7 +153,7 @@ public class TeamSuperSmash extends SuperSmash
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Banana", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
index 75aede149..81854bdae 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/TeamSurvivalGames.java
@@ -106,7 +106,7 @@ public class TeamSurvivalGames extends SurvivalGames
 	private enum TeamColors
 	{
 	
-		YELLOW(ChatColor.YELLOW, new String[]{"Bananna", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
+		YELLOW(ChatColor.YELLOW, new String[]{"Banana", "Sunshine", "Custard", "Sponge", "Star", "Giraffe", "Lego", "Light"}),
 		GREEN(ChatColor.GREEN, new String[]{"Creepers", "Alien", "Seaweed", "Emerald", "Grinch", "Shrub", "Snake", "Leaf"}),
 		AQUA(ChatColor.AQUA, new String[]{"Diamond", "Ice", "Pool", "Kraken", "Aquatic", "Ocean"}),
 		RED(ChatColor.RED, new String[]{"Heart", "Tomato", "Ruby", "Jam", "Rose", "Apple", "TNT"}),
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java
index e3d65cd81..ce4603693 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java
@@ -131,7 +131,10 @@ public class PerkNeedler extends SmashPerk
 				DamageCause.THORNS, 1.1, true, true, false,
 				damager.getName(), GetName());	
 
-		Manager.GetCondition().Factory().Poison(GetName(), event.GetDamageeEntity(), damager, 2, 0, false, false, false);
+		if(Manager.GetGame().GetTeam(event.GetDamageePlayer()) != Manager.GetGame().GetTeam(damager))
+		{
+			Manager.GetCondition().Factory().Poison(GetName(), event.GetDamageeEntity(), damager, 2, 0, false, false, false);
+		}
 	}
 	
 	@EventHandler

From 37e432f0b2d0445eb4e99c76687fcd27d42e3c44 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Thu, 30 Jul 2015 03:07:21 +0200
Subject: [PATCH 087/113] Git fix.

---
 .../src/nautilus/game/arcade/game/games/skywars/Skywars.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index 9d3225c24..8a3dec9c4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 import mineplex.core.common.util.MapUtil;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAction;
@@ -24,6 +25,7 @@ import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilTime.TimeUnit;
 import mineplex.core.explosion.ExplosionEvent;
+import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.loot.ChestLoot;
 import mineplex.core.loot.RandomItem;
 import mineplex.core.updater.UpdateType;
@@ -41,8 +43,8 @@ import nautilus.game.arcade.game.games.skywars.data.TNTGenerator;
 import nautilus.game.arcade.game.games.skywars.events.PlayerKillZombieEvent;
 import nautilus.game.arcade.game.games.skywars.kits.KitChicken;
 import nautilus.game.arcade.game.games.skywars.kits.KitDestructor;
-import nautilus.game.arcade.game.games.skywars.kits.KitMadScientist;
 import nautilus.game.arcade.game.games.skywars.kits.KitMiner;
+import nautilus.game.arcade.game.games.skywars.kits.KitMadScientist;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.ore.OreHider;
 import nautilus.game.arcade.stats.DeathBomberStatTracker;
@@ -65,6 +67,7 @@ import org.bukkit.entity.Chicken;
 import org.bukkit.entity.Egg;
 import org.bukkit.entity.EnderPearl;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;

From 0cf333ec0086c7b2cfe87a5d765059f8f3965416 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 14:12:17 +0200
Subject: [PATCH 088/113] lowered win req

---
 .../src/mineplex/core/achievement/Achievement.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index 24dfd5c88..525ca469a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -56,7 +56,7 @@ public enum Achievement
 	//Survival Games
 	SURVIVAL_GAMES_WINS("Katniss Everdeen", 600,
 			new String[]{"Survival Games.Wins"},
-			new String[]{"Win 30 games of Survival Games"},
+			new String[]{"Win 20 games of Survival Games"},
 			new int[]{30},
 			AchievementCategory.SURVIVAL_GAMES),
 
@@ -87,7 +87,7 @@ public enum Achievement
 	//Skywars
 	SKYWARS_WINS("Sky King",2000,
 			new String[]{"Skywars.Wins"},
-			new String[]{"Win 30 Games of Skywars"},
+			new String[]{"Win 20 Games of Skywars"},
 			new int[]{30},
 			AchievementCategory.SKYWARS),
 			

From 45d117a95a15ab169ea6667581c004d855a93557 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 14:45:28 +0200
Subject: [PATCH 089/113] added armor hotbar to smash

fixed scoreboard in snowfight
---
 .../nautilus/game/arcade/game/games/smash/TeamSuperSmash.java  | 2 ++
 .../nautilus/game/arcade/game/games/snowfight/SnowFight.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
index cabc6d67c..1d3b3052c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java
@@ -49,6 +49,8 @@ public class TeamSuperSmash extends SuperSmash
 		
 		this.SpawnNearAllies = true;
 		this.DamageTeamSelf = false;
+		
+		this.TeamArmorHotbar = true;
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
index e06fdc2e8..a2e27f88e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
@@ -595,6 +595,9 @@ public class SnowFight extends TeamGame
 		{
 			for (GameTeam team : this.GetTeamList())
 			{			
+				if (!team.IsTeamAlive())
+					continue;
+				
 				for(Player player : team.GetPlayers(true))
 				{
 					Scoreboard.Write(team.GetColor() + player.getName());

From 8a5088e18153f28d248831a4833ebb03ffeb1b2e Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 14:47:59 +0200
Subject: [PATCH 090/113] fixed SGT deathmatch not working

---
 .../game/arcade/game/games/survivalgames/SurvivalGames.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
index 3c6e05d7a..0e984eb4c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
@@ -748,7 +748,8 @@ public abstract class SurvivalGames extends Game
 			WorldTimeSet = 0;
 			WorldData.World.setTime(15000);
 
-			GetTeamList().get(0).SpawnTeleport(false);
+			for (GameTeam team : GetTeamList())
+				team.SpawnTeleport(false);
 
 			_borderPositions.clear();
 

From 8d7c42134befeed231687c0e3480b907e066ebf0 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 14:54:23 +0200
Subject: [PATCH 091/113] fixed mounts having nametags

---
 .../src/mineplex/core/gadget/GadgetManager.java    | 14 ++++++++++++++
 .../src/mineplex/core/mount/types/MountSheep.java  |  1 -
 .../src/mineplex/core/mount/types/MountSlime.java  |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index 775206ffd..bc7f2ac7d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -6,12 +6,14 @@ import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniPlugin;
@@ -430,4 +432,16 @@ public class GadgetManager extends MiniPlugin
 		
 		return true;
 	}
+	
+	@EventHandler
+	public void chissMeow(PlayerToggleSneakEvent event)
+	{
+		if (event.getPlayer().getName().equals("Chiss"))
+		{
+			if (!event.getPlayer().isSneaking())
+			{
+				event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.CAT_MEOW, 1f, 1f);
+			}
+		}
+	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
index bcee6ee2a..e2982d6ab 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSheep.java
@@ -52,7 +52,6 @@ public class MountSheep extends HorseMount
 		
 		DisguiseSheep disguise = new DisguiseSheep(horse);
 		disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
-		disguise.setCustomNameVisible(true);
 		//disguise.setColor(DyeColor.getByColor(org.bukkit.Color.fromRGB(100, 0, 200)));
 		Manager.getDisguiseManager().disguise(disguise);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
index 5bf9b6da2..1dccbdad5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
@@ -48,7 +48,6 @@ public class MountSlime extends Mount<Slime>
 		mount.setSize(2);
 		
 		mount.setCustomName(player.getName() + "'s " + GetName());
-		mount.setCustomNameVisible(true);
 
 		//Inform
 		UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));

From 31fd19aab5a74a341961423ed24c5b0b2c2d0232 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 15:07:05 +0200
Subject: [PATCH 092/113] added res pack for CC

---
 .../Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 355d0a853..85dca7b11 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -71,7 +71,7 @@ public enum GameType
 	ChampionsDominate(ChampionsDominate.class, GameDisplay.ChampionsDominate),
 	//ChampionsMOBA(ChampionsMOBA.class, "Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS, 7),
 	ChampionsTDM(ChampionsTDM.class, GameDisplay.ChampionsTDM),
-	Christmas(Christmas.class, GameDisplay.Christmas),
+	Christmas(Christmas.class, GameDisplay.Christmas, "http://chivebox.com/file/c/xmas.zip", true),
 	DeathTag(DeathTag.class, GameDisplay.DeathTag),
 	DragonEscape(DragonEscape.class, GameDisplay.DragonEscape),
 	DragonEscapeTeams(DragonEscapeTeams.class, GameDisplay.DragonEscapeTeams),

From a3d768af6b202e3140fa08c8f414c4fef9a05921 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 30 Jul 2015 15:07:40 +0200
Subject: [PATCH 093/113] added res pack for HH

---
 .../Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
index 85dca7b11..65ee7948a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -82,7 +82,7 @@ public enum GameType
 	Evolution(Evolution.class, GameDisplay.Evolution),
 	//FlappyBird(FlappyBird.class, "Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE, 17),
 	Gravity(Gravity.class, GameDisplay.Gravity),
-	Halloween(Halloween.class, GameDisplay.Halloween),
+	Halloween(Halloween.class, GameDisplay.Halloween, "http://chivebox.com/file/c/hh.zip", true),
 	HideSeek(HideSeek.class, GameDisplay.HideSeek),
 	HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
 	Horse(Horse.class, GameDisplay.Horse),

From b2a567673c0d5d72e8e81442992265ce7ffc1cad Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Fri, 31 Jul 2015 09:53:52 +0200
Subject: [PATCH 094/113] disabled sale msg added double gem weekend

---
 .../src/mineplex/core/notifier/NotificationManager.java       | 4 ++--
 .../src/nautilus/game/arcade/managers/GameGemManager.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
index 808d3fe33..342d7b840 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
@@ -45,8 +45,8 @@ public class NotificationManager extends MiniPlugin
 //		if (event.getType() == UpdateType.MIN_08)
 //			hugeSale();
 		
-		if (event.getType() == UpdateType.MIN_16)
-			sale();
+//		if (event.getType() == UpdateType.MIN_16)
+//			sale();
 	}
 
 	private void sale() 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
index 3617ab6a1..844b78975 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
@@ -30,7 +30,7 @@ public class GameGemManager implements Listener
 {
 	ArcadeManager Manager;
 
-	boolean DoubleGem = false;
+	boolean DoubleGem = true;
 
 	public GameGemManager(ArcadeManager manager)
 	{

From 60a176882184eef5676dbe40ec43fd5e9d89d22e Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 31 Jul 2015 13:05:28 +0200
Subject: [PATCH 095/113] Fixing Team display bug on disbanding.

---
 .../src/nautilus/game/arcade/game/GameTeam.java            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index 4d8d686c9..2cede3960 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import mineplex.core.account.CoreClient;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAlg;
@@ -164,7 +165,13 @@ public class GameTeam
 	public void DisbandTeam() 
 	{
 		for (Player player : _players.keySet())
+		{
+			for(Player other : UtilServer.getPlayers())
+			{
+				other.getScoreboard().getTeam(Host.Manager.GetClients().Get(player).GetRank().Name + _name.toUpperCase()).removePlayer(player);
+			}
 			UtilPlayer.message(player, F.main("Team",  _color + C.Bold + _displayName + " Team was disbanded."));
+		}
 		 
 		_players.clear();
 	}

From b2c538b18935817876117512ce6a6f2d6b9fc0f5 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 31 Jul 2015 13:40:39 +0200
Subject: [PATCH 096/113] little tag fix.

---
 .../src/nautilus/game/arcade/game/GameTeam.java                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index 2cede3960..a4adccbd5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -169,6 +169,7 @@ public class GameTeam
 			for(Player other : UtilServer.getPlayers())
 			{
 				other.getScoreboard().getTeam(Host.Manager.GetClients().Get(player).GetRank().Name + _name.toUpperCase()).removePlayer(player);
+				other.getScoreboard().getTeam(Host.Manager.GetClients().Get(player).GetRank().Name).addPlayer(player);
 			}
 			UtilPlayer.message(player, F.main("Team",  _color + C.Bold + _displayName + " Team was disbanded."));
 		}

From fba10e4cbd2fa3ca0e12362be48cd91c2e282fd1 Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Fri, 31 Jul 2015 14:08:08 +0200
Subject: [PATCH 097/113] fixing the long term "Kit" bug ;D

---
 .../nautilus/game/arcade/managers/GameLobbyManager.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
index 3eed707a6..36c3573c4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
@@ -980,7 +980,14 @@ public class GameLobbyManager implements Listener, IPacketHandler
 						kitName = kitName.substring(0, 16);
 
 				// Remove old
-				entry.getValue().resetScores(C.cGray + C.Bold +  "Kit");
+				//entry.getValue().resetScores(teamColor + C.Bold +  "Kit");
+				for(String string : entry.getValue().getEntries())
+				{
+					if(string.endsWith("Kit"))
+					{
+						entry.getValue().resetScores(string);
+					}
+				}
 				entry.getValue().resetScores(_kitMap.get(entry.getKey()) + "");
 
 				// Set new

From d3c5d0cbe66b9899ec037caccd6be2894c4d3b45 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sat, 1 Aug 2015 01:12:01 -0500
Subject: [PATCH 098/113] Only store account cache stuff for 6 hours. Update
 MOtd.

---
 .../src/mineplex/bungee/motd/MotdManager.java                 | 2 +-
 .../src/mineplex/core/account/CoreClientManager.java          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
index 49e6f6ae1..05284beeb 100644
--- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
+++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
@@ -39,7 +39,7 @@ public class MotdManager implements Listener, Runnable
 		if (new File("updateMOTD.dat").exists())
 		{
 			List<String> lines = new ArrayList<String>();
-			lines.add("             §b§l◄§f§lNEW§b§l►     §f§l◄§b§lSKYWARS§f§l►     §b§l◄§f§lNEW§b§l►");
+			lines.add("       §f§l◄ §6§lNEW ARCADE GAME §f§l▬ §c§lBOMB LOBBERS §f§l►");
 			//lines.add("                     §d§lRank Sale §a§l40% Off");
 			//lines.add("                        §f§l◄§c§lMAINTENANCE§f§l►");
 			
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index a76be2fcd..3e5b7196e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -227,7 +227,7 @@ public class CoreClientManager extends MiniPlugin
 					Bukkit.getServer().getPluginManager().callEvent(new ClientWebResponseEvent(response, uuid));
 					
 					if (client.getAccountId() > 0)
-						_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()));
+						_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()), 60 * 60 * 6);
 				}
 				catch (Exception exception)
 				{
@@ -301,7 +301,7 @@ public class CoreClientManager extends MiniPlugin
 		System.out.println(client.GetPlayerName() + "'s account id = " + client.getAccountId());
 		
 		if (client.getAccountId() > 0)
-			_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()));
+			_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()), 60 * 60 * 6);
 		
 		return !_clientLoginLock.containsKey(client.GetPlayerName());
 	}

From 7910170327069177023cf87b2b9500523b753827 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sat, 1 Aug 2015 18:39:18 +0200
Subject: [PATCH 099/113] fixed achievemnt amount

---
 .../src/mineplex/core/achievement/Achievement.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index 525ca469a..64d6215aa 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -88,7 +88,7 @@ public enum Achievement
 	SKYWARS_WINS("Sky King",2000,
 			new String[]{"Skywars.Wins"},
 			new String[]{"Win 20 Games of Skywars"},
-			new int[]{30},
+			new int[]{20},
 			AchievementCategory.SKYWARS),
 			
 	SKYWARS_BOMBER("Master Bomber",500,

From ac4755a5a944d4ba075e8b07626d3e9901c9578a Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 2 Aug 2015 11:24:34 +0200
Subject: [PATCH 100/113] Fixed incorrect velocity

---
 .../mineplex/core/common/util/UtilAction.java | 15 +++--
 .../mineplex/core/velocity/VelocityFix.java   | 65 +++++++++++++++++++
 .../Mineplex.Hub/src/mineplex/hub/Hub.java    |  4 ++
 .../game/core/damage/DamageManager.java       | 11 +---
 .../src/nautilus/game/arcade/Arcade.java      |  5 ++
 5 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index 09160ddc7..c07d2ed4a 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -1,6 +1,5 @@
 package mineplex.core.common.util;
 
-
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
@@ -9,6 +8,8 @@ import org.bukkit.util.Vector;
 
 public class UtilAction
 {
+	public static NautHashMap<Player, Vector> VelocityFix = new NautHashMap<Player,Vector>();
+	
 	public static void velocity(Entity ent, double str, double yAdd, double yMax, boolean groundBoost)
 	{
 		velocity(ent, ent.getLocation().getDirection(), str, false, 0, yAdd, yMax, groundBoost);
@@ -41,13 +42,13 @@ public class UtilAction
 		//Velocity
 		ent.setFallDistance(0);
 		
-		
-		//Debug
-		if (ent instanceof Player && UtilGear.isMat(((Player)ent).getItemInHand(), Material.SUGAR))
+				
+		//Store It!
+		if (ent instanceof Player)
 		{
-			Bukkit.broadcastMessage(F.main("Debug", "Velocity Sent: " + vec.length()));
-		}	
-		
+			VelocityFix.put(((Player)ent), vec);
+		}
+			
 		ent.setVelocity(vec);	
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
new file mode 100644
index 000000000..a4124f27a
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
@@ -0,0 +1,65 @@
+package mineplex.core.velocity;
+
+import java.util.Iterator;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerVelocityEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class VelocityFix extends MiniPlugin
+{
+	/*
+	 * The purpose of this class is to fix a bug inherent in Minecraft, 
+	 * where player join order will somehow modify the velocity sent to players.
+	 * 
+	 * To fix it, we simply save the velocity that the player should have received,
+	 * then we re-set those values in CB the moment its about to actually apply the velocity to a player.
+	 * 
+	 * The problem was caused by the fact that CB does not run a PlayerVelocityEvent the moment we
+	 * set a players velocity, instead it waits until the next tick, and the velocity may have been changed.
+	 * 
+	 */
+	
+	public VelocityFix(JavaPlugin plugin)
+	{
+		super("Velocity Fix", plugin);
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST)
+	public void fixVelocity(PlayerVelocityEvent event)
+	{
+		if (UtilAction.VelocityFix.containsKey(event.getPlayer()))
+			event.getPlayer().setVelocity(UtilAction.VelocityFix.remove(event.getPlayer()));
+	}
+	
+	@EventHandler
+	public void cleanVelocity(PlayerQuitEvent event)
+	{
+		UtilAction.VelocityFix.remove(event.getPlayer());
+	}
+	
+	@EventHandler
+	public void cleanVelocity(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SLOW)
+			return;
+		
+		Iterator<Player> keyIter = UtilAction.VelocityFix.keySet().iterator();
+		
+		while (keyIter.hasNext())
+		{
+			Player player = keyIter.next();
+			
+			if (player.isOnline())
+				keyIter.remove();
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
index 1cf6b3b8f..0873db91b 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
@@ -46,6 +46,7 @@ import mineplex.core.task.TaskManager;
 import mineplex.core.teleport.Teleport;
 import mineplex.core.updater.FileUpdater;
 import mineplex.core.updater.Updater;
+import mineplex.core.velocity.VelocityFix;
 import mineplex.core.visibility.VisibilityManager;
 import mineplex.hub.modules.StackerManager;
 import mineplex.hub.poll.PollManager;
@@ -78,6 +79,9 @@ public class Hub extends JavaPlugin implements IRelation
 		 
 		//Logger.initialize(this);
 		 
+		//Velocity Fix
+		new VelocityFix(this);
+		
 		//Static Modules
 		CommandCenter.Initialize(this);
 		CoreClientManager clientManager = new CoreClientManager(this, webServerAddress);
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
index 1d699e938..ec5e4113c 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
@@ -395,7 +395,7 @@ public class DamageManager extends MiniPlugin
 				if (event.GetDamageeEntity() instanceof Player && UtilGear.isMat(((Player)event.GetDamageeEntity()).getItemInHand(), Material.SUGAR))
 				{
 					Bukkit.broadcastMessage("--------- " + 
-				UtilEnt.getName(event.GetDamageeEntity()) + " hurt by " + UtilEnt.getName(event.GetDamagerEntity(true)) + "-----------" );
+				UtilEnt.getName(event.GetDamageeEntity()) + " hit by " + UtilEnt.getName(event.GetDamagerEntity(true)) + "-----------" );
 					
 					Bukkit.broadcastMessage(F.main("Debug", "Damage: " + event.GetDamage()));
 				}
@@ -422,15 +422,6 @@ public class DamageManager extends MiniPlugin
 		}
 	}
 
-	@EventHandler
-	public void debugVel2(PlayerVelocityEvent event)
-	{
-		if (UtilGear.isMat(((Player)event.getPlayer()).getItemInHand(), Material.SUGAR))
-		{
-			Bukkit.broadcastMessage(F.main("Debug", "Event: " + event.getVelocity().length()));
-		}
-	}
-
 	private void DisplayDamage(CustomDamageEvent event) 
 	{
 		for (Player player : UtilServer.getPlayers())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
index b61c92d36..772f894ed 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
@@ -48,6 +48,7 @@ import mineplex.core.status.ServerStatusManager;
 import mineplex.core.teleport.Teleport;
 import mineplex.core.updater.FileUpdater;
 import mineplex.core.updater.Updater;
+import mineplex.core.velocity.VelocityFix;
 import mineplex.core.visibility.VisibilityManager;
 import mineplex.minecraft.game.core.combat.CombatManager;
 import mineplex.minecraft.game.core.damage.DamageManager;
@@ -86,10 +87,14 @@ public class Arcade extends JavaPlugin
 		_clientManager = new CoreClientManager(this, webServerAddress);
 		CommandCenter.Instance.setClientManager(_clientManager);
 
+		
 		ItemStackFactory.Initialize(this, false);  
 		Recharge.Initialize(this);   
 		VisibilityManager.Initialize(this);
 		Give.Initialize(this);
+		
+		//Velocity Fix
+		new VelocityFix(this);
 
 		_donationManager = new DonationManager(this, _clientManager, webServerAddress);
 

From afc41c883134f4270cefaf243b067946c8e7a637 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 2 Aug 2015 11:50:26 +0200
Subject: [PATCH 101/113] converted Player velocities to use UtilAction
 velocity methods, instead of Player.setVelocity

---
 .../mineplex/core/common/util/UtilAction.java | 50 ++++++++++++++-----
 .../core/gadget/gadgets/MorphWither.java      |  2 +-
 .../src/mineplex/core/teleport/Teleport.java  |  3 +-
 .../mineplex/core/velocity/VelocityFix.java   |  8 +--
 .../mineplex/hub/modules/StackerManager.java  |  3 +-
 .../game/classcombat/Skill/Mage/Blizzard.java |  4 +-
 .../game/core/mechanics/PistonJump.java       |  4 +-
 .../nautilus/game/arcade/ArcadeManager.java   |  3 +-
 .../game/arcade/game/games/bridge/Bridge.java |  3 +-
 .../game/arcade/game/games/build/Build.java   |  3 +-
 .../game/games/dragonescape/DragonEscape.java |  4 +-
 .../games/dragonescape/DragonEscapeTeams.java |  4 +-
 .../game/games/holeinwall/HoleInTheWall.java  |  5 +-
 .../game/games/minestrike/MineStrike.java     |  2 +-
 .../game/games/paintball/Paintball.java       |  3 +-
 .../arcade/game/games/skywars/Skywars.java    |  2 +-
 .../game/arcade/kit/perks/PerkBlizzard.java   |  5 +-
 .../game/arcade/kit/perks/PerkBoneRush.java   |  2 +-
 .../arcade/kit/perks/PerkCreeperExplode.java  |  1 +
 .../arcade/kit/perks/PerkDeathsGrasp.java     |  2 +-
 .../game/arcade/kit/perks/PerkDisruptor.java  |  3 +-
 .../game/arcade/kit/perks/PerkEggGun.java     |  3 +-
 .../game/arcade/kit/perks/PerkFirefly.java    |  6 +--
 .../game/arcade/kit/perks/PerkFlameDash.java  |  3 +-
 .../game/arcade/kit/perks/PerkFlameSlam.java  |  2 +-
 .../game/arcade/kit/perks/PerkFleshArrow.java |  2 +-
 .../game/arcade/kit/perks/PerkIcePath.java    |  3 +-
 .../game/arcade/kit/perks/PerkSnowTurret.java |  2 +-
 .../game/arcade/kit/perks/PerkSpiderLeap.java |  2 +-
 .../game/arcade/kit/perks/PerkTakedown.java   |  2 +-
 .../game/arcade/kit/perks/PerkWebShot.java    |  2 +-
 .../game/arcade/kit/perks/PerkWolf.java       |  6 +--
 .../game/arcade/kit/perks/PerkWolfPack.java   |  2 +-
 .../game/arcade/managers/GameFlagManager.java |  4 +-
 34 files changed, 99 insertions(+), 56 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index c07d2ed4a..0d603ac7b 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -1,15 +1,23 @@
 package mineplex.core.common.util;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 public class UtilAction
 {
-	public static NautHashMap<Player, Vector> VelocityFix = new NautHashMap<Player,Vector>();
+	private static NautHashMap<Player, Vector> _velocityFix = new NautHashMap<Player,Vector>();
+
+	public static void velocity(Entity ent, Vector vec) 
+	{
+		velocity(ent, vec, 1, false, 0, 0, vec.length(), false);
+	}
 	
+	public static NautHashMap<Player, Vector> getVelocityData()
+	{
+		return _velocityFix;
+	}
+
 	public static void velocity(Entity ent, double str, double yAdd, double yMax, boolean groundBoost)
 	{
 		velocity(ent, ent.getLocation().getDirection(), str, false, 0, yAdd, yMax, groundBoost);
@@ -18,8 +26,11 @@ public class UtilAction
 	public static void velocity(Entity ent, Vector vec, double str, boolean ySet, double yBase, double yAdd, double yMax, boolean groundBoost)
 	{
 		if (Double.isNaN(vec.getX()) || Double.isNaN(vec.getY()) || Double.isNaN(vec.getZ()) || vec.length() == 0)
+		{
+			zeroVelocity(ent);
 			return;
-		
+		}
+
 		//YSet
 		if (ySet)
 			vec.setY(yBase);
@@ -27,28 +38,43 @@ public class UtilAction
 		//Modify
 		vec.normalize();
 		vec.multiply(str);
-		
+
 		//YAdd
 		vec.setY(vec.getY() + yAdd);
-		
+
 		//Limit
 		if (vec.getY() > yMax)
 			vec.setY(yMax);
-		
+
 		if (groundBoost)
 			if (UtilEnt.isGrounded(ent))
 				vec.setY(vec.getY() + 0.2); 
-		
+
 		//Velocity
 		ent.setFallDistance(0);
-		
-				
+
 		//Store It!
 		if (ent instanceof Player)
 		{
-			VelocityFix.put(((Player)ent), vec);
+			_velocityFix.put(((Player)ent), vec);
 		}
-			
+
+		ent.setVelocity(vec);
+	}
+
+	public static void zeroVelocity(Entity ent) 
+	{
+		Vector vec = new Vector(0,0,0);
+		ent.setFallDistance(0);
+
+		//Store It!
+		if (ent instanceof Player)
+		{
+			_velocityFix.put(((Player)ent), vec);
+		}
+
 		ent.setVelocity(vec);	
 	}
+
+
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
index 62ff23a36..14ade61ab 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphWither.java
@@ -170,7 +170,7 @@ public class MorphWither extends MorphGadget
 			player.setFlying(true);
 			
 			if (UtilEnt.isGrounded(player))
-				player.setVelocity(new Vector(0,1,0));
+				UtilAction.velocity(player, new Vector(0,1,0), 1, false, 0, 0, 1, true);
 		}
 	}
 	
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
index 79c342ce9..57e62c7df 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
@@ -20,6 +20,7 @@ import mineplex.core.common.jsonchat.JsonMessage;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilWorld;
@@ -285,7 +286,7 @@ public class Teleport extends MiniPlugin
 		}
 		
 		player.setFallDistance(0);
-		player.setVelocity(new Vector(0,0,0));
+		UtilAction.velocity(player, new Vector(0,1,0), 0, false, 0, 0, 0, false);
 		
 		player.teleport(loc);
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
index a4124f27a..f06ba4cf2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
@@ -36,14 +36,14 @@ public class VelocityFix extends MiniPlugin
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void fixVelocity(PlayerVelocityEvent event)
 	{
-		if (UtilAction.VelocityFix.containsKey(event.getPlayer()))
-			event.getPlayer().setVelocity(UtilAction.VelocityFix.remove(event.getPlayer()));
+		if (UtilAction.getVelocityData().containsKey(event.getPlayer()))
+			event.getPlayer().setVelocity(UtilAction.getVelocityData().remove(event.getPlayer()));
 	}
 	
 	@EventHandler
 	public void cleanVelocity(PlayerQuitEvent event)
 	{
-		UtilAction.VelocityFix.remove(event.getPlayer());
+		UtilAction.getVelocityData().remove(event.getPlayer());
 	}
 	
 	@EventHandler
@@ -52,7 +52,7 @@ public class VelocityFix extends MiniPlugin
 		if (event.getType() != UpdateType.SLOW)
 			return;
 		
-		Iterator<Player> keyIter = UtilAction.VelocityFix.keySet().iterator();
+		Iterator<Player> keyIter = UtilAction.getVelocityData().keySet().iterator();
 		
 		while (keyIter.hasNext())
 		{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
index 43002d101..b1bd4551e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
@@ -255,7 +255,8 @@ public class StackerManager extends MiniPlugin implements IThrown
 			Manager.SetPortalDelay(rider);
 			
 			rider.leaveVehicle();
-			rider.setVelocity(new Vector(0.25 - Math.random()/2, Math.random()/2, 0.25 - Math.random()/2));
+			UtilAction.velocity(rider, new Vector(0.25 - Math.random()/2, Math.random()/2, 0.25 - Math.random()/2), 
+					1, false, 0, 0, 0, false);
 			rider = rider.getPassenger();
 		}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java
index 5616119ee..9075c6d31 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java
@@ -26,6 +26,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import mineplex.core.common.util.F;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
@@ -209,7 +210,8 @@ public class Blizzard extends SkillActive
 		if (damagee == null)	return;
 
 		event.SetCancelled(GetName());
-		damagee.setVelocity(proj.getVelocity().multiply(0.1).add(new Vector(0, 0.15, 0)));
+		UtilAction.velocity(damagee, proj.getVelocity().multiply(0.1).add(new Vector(0, 0.15, 0)), 
+				1, false, 0, 0, 0, false);
 	}
 
 	@EventHandler
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/PistonJump.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/PistonJump.java
index 1a23e9669..72080881d 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/PistonJump.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/mechanics/PistonJump.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import mineplex.core.MiniPlugin;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilTime;
 
 import org.bukkit.Material;
@@ -54,8 +55,7 @@ public class PistonJump extends MiniPlugin
 			//Vector
 			Vector vec =  new Vector(0,1.2,0);
 
-			player.setVelocity(vec);
-			player.setFallDistance(0);
+			UtilAction.velocity(player, vec);
 		}
 
 		final Block block = below;
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 131fd4fb4..cc264d1e6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -49,6 +49,7 @@ import mineplex.core.common.jsonchat.JsonMessage;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilGear;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilPlayer;
@@ -1333,7 +1334,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 			player.teleport(GetGame().GetSpectatorLocation());
 		
 		//Set Spec State
-		player.setVelocity(new Vector(0,1,0));
+		UtilAction.velocity(player, new Vector(0,1,0));
 		player.setAllowFlight(true);
 		player.setFlying(true);
 		player.setFlySpeed(0.1f);
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 52f199735..e17db6abc 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
@@ -45,6 +45,7 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.MapUtil;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEvent;
@@ -1178,7 +1179,7 @@ public class Bridge extends TeamGame implements OreObsfucation
 			UtilPlayer.message(event.getPlayer(), F.main("Game",
 					"Cannot place blocks in liquids until Bridge is down."));
 
-			event.getPlayer().setVelocity(new Vector(0,-0.5,0));
+			UtilAction.velocity(event.getPlayer(), new Vector(0, -0.5, 0));
 
 			event.setCancelled(true);
 			return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
index 1d7ee11d3..92ead83b8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
@@ -67,6 +67,7 @@ import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
@@ -707,7 +708,7 @@ public class Build extends SoloGame
 			event.setTo(event.getFrom());
 
 			//Velocity
-			event.getPlayer().setVelocity(UtilAlg.getTrajectory(event.getTo(), data.Spawn));
+			UtilAction.velocity(event.getPlayer(), UtilAlg.getTrajectory(event.getTo(), data.Spawn));
 		}
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
index 9caea2e88..d385a752f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java
@@ -34,6 +34,7 @@ import org.bukkit.util.Vector;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilServer;
@@ -526,8 +527,7 @@ public class DragonEscape extends SoloGame
 						
 			//Teleport
 			player.teleport(target.getLocation().add(0, 0.5, 0));
-			player.setVelocity(new Vector(0,0,0));
-			player.setFallDistance(0);
+			UtilAction.velocity(player, new Vector(0,0,0));
 			
 			//Record
 			_warpTime.put(player, System.currentTimeMillis());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java
index 9460a9d67..01e439add 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java
@@ -26,6 +26,7 @@ import org.bukkit.util.Vector;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilInv;
@@ -540,8 +541,7 @@ public class DragonEscapeTeams extends TeamGame
 						
 			//Teleport
 			player.teleport(target.getLocation().add(0, 0.5, 0));
-			player.setVelocity(new Vector(0,0,0));
-			player.setFallDistance(0);
+			UtilAction.velocity(player, new Vector(0,0,0));
 			
 			//Record
 			_warpTime.put(player, System.currentTimeMillis());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/HoleInTheWall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/HoleInTheWall.java
index 509ebd349..917bf5f77 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/HoleInTheWall.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/HoleInTheWall.java
@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -15,6 +16,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.SoloGame;
 import nautilus.game.arcade.kit.Kit;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -225,7 +227,8 @@ public class HoleInTheWall extends SoloGame
 		{
 			wall.getKnockedPlayers().add(player.getUniqueId());
 
-			player.setVelocity(_wallVector.clone().normalize().multiply(5).setY(0.3));
+		
+			UtilAction.velocity(player, _wallVector.clone().normalize().multiply(5).setY(0.3));
 			player.playSound(player.getLocation(), Sound.NOTE_BASS, 2, 1F);
 		}
 		/*Location toTeleport = player.getLocation();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
index 010eaf74c..d35daf11e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
@@ -1305,7 +1305,7 @@ public class MineStrike extends TeamGame
 		//Mini-Stun
 		else
 		{
-			event.GetDamageePlayer().setVelocity(new Vector(0,0,0));
+			UtilAction.velocity(event.GetDamageePlayer(), new Vector(0,0,0));
 		}
 
 		event.SetKnockback(false);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
index 75982a00d..550bdb153 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
@@ -35,6 +35,7 @@ import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
@@ -307,7 +308,7 @@ public class Paintball extends TeamGame
 		((CraftPlayer)player).getHandle().spectating = true;
 		((CraftPlayer)player).getHandle().k = false;
 
-		player.setVelocity(new Vector(0,1.2,0));
+		UtilAction.velocity(player, new Vector(0,1.2,0));
 
 		_doubles.put(player, new PlayerCopy(this, player, GetTeam(player).GetColor()));
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index e042dd7b5..00eb0798a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -982,7 +982,7 @@ public abstract class Skywars extends Game
 			if (vel.getY() < 0.1)
 				vel.setY(0.1);
 			
-			event.GetDamageeEntity().setVelocity(vel);
+			UtilAction.velocity(event.GetDamageeEntity(), vel);
 		}
 	}
 	
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
index 93b52fbda..581a9511c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBlizzard.java
@@ -14,13 +14,13 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
-
 import nautilus.game.arcade.kit.Perk;
 
 public class PerkBlizzard extends Perk
@@ -108,8 +108,9 @@ public class PerkBlizzard extends Perk
 		if (damagee == null)	return;
 
 		event.SetCancelled("Blizzard");
-		damagee.setVelocity(proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0)));
 
+		UtilAction.velocity(damagee, proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0)));
+		
 		//Damage Event
 		if (damagee instanceof Player)
 			if (Recharge.Instance.use((Player)damagee, GetName(), 200, false, false))
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBoneRush.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBoneRush.java
index e802a911b..d04a88096 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBoneRush.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBoneRush.java
@@ -162,7 +162,7 @@ public class PerkBoneRush extends SmashPerk implements IThrown
 				DamageCause.CUSTOM, damage, false, true, false,
 				UtilEnt.getName(data.GetThrower()), reason);	
 
-		target.setVelocity(data.GetThrown().getVelocity());
+		UtilAction.velocity(target, data.GetThrown().getVelocity());
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java
index 4e1c99624..6c4d9c096 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java
@@ -106,6 +106,7 @@ public class PerkCreeperExplode extends SmashPerk
 
 			//Idle in Air
 			player.setVelocity(new Vector(0,0,0));
+			UtilAction.zeroVelocity(player);
 			
 			//Sound
 			player.getWorld().playSound(player.getLocation(), Sound.CREEPER_HISS, (float)(0.5 + elapsed), (float)(0.5 + elapsed));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
index 4ceaaee33..51883a447 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
@@ -145,7 +145,7 @@ public class PerkDeathsGrasp extends Perk
 		
 		UtilAction.velocity(damagee, UtilAlg.getTrajectory(damagee, damager), 1.8, false, 0, 1, 1.8, true);
 		
-		damager.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(damager);
 		
 		damager.getWorld().playSound(damager.getLocation(), Sound.ZOMBIE_HURT, 1f, 0.7f);
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDisruptor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDisruptor.java
index 71f774580..844c49551 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDisruptor.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDisruptor.java
@@ -16,6 +16,7 @@ import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilServer;
@@ -126,7 +127,7 @@ public class PerkDisruptor extends Perk
 		_tntMap.remove(event.getItem());
 		event.getItem().remove();
 		
-		event.getPlayer().setVelocity(new Vector(0,0.5,0));
+		UtilAction.velocity(event.getPlayer(), new Vector(0, 0.5, 0));
 		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.EXPLODE, 1f, 2f);
 		event.getPlayer().playEffect(EntityEffect.HURT);
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java
index 8530d4b8f..727a2bfc2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkEggGun.java
@@ -14,6 +14,7 @@ import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
@@ -130,6 +131,6 @@ public class PerkEggGun extends SmashPerk
 				DamageCause.PROJECTILE, 1, true, true, false,
 				UtilEnt.getName((LivingEntity)egg.getShooter()), GetName());
 		
-		event.GetDamageeEntity().setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(event.GetDamageeEntity());
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFirefly.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFirefly.java
index c8c2946a3..2907433d2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFirefly.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFirefly.java
@@ -17,6 +17,7 @@ import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilFirework;
 import mineplex.core.common.util.UtilPlayer;
@@ -101,7 +102,7 @@ public class PerkFirefly extends SmashPerk
 			//Teleport
 			if (!UtilTime.elapsed(data.Time, 1500) && !superActive)
 			{
-				data.Player.setVelocity(new Vector(0,0,0));//.teleport(data.Location);	
+				UtilAction.zeroVelocity(data.Player);
 				data.Player.getWorld().playSound(data.Player.getLocation(), Sound.EXPLODE, 0.2f, 0.6f);
 				data.Location = data.Player.getLocation();
 				
@@ -115,8 +116,7 @@ public class PerkFirefly extends SmashPerk
 			//Velocity
 			else if (!UtilTime.elapsed(data.Time, 2500) || superActive)
 			{
-				data.Player.setVelocity(data.Player.getLocation().getDirection().multiply(superActive ? 0.9 : 0.7).add(new Vector(0,0.15,0)));
-				//data.Player.setVelocity(data.Location.getDirection().multiply(0.7).add(new Vector(0,0.1,0)));
+				UtilAction.velocity(data.Player, data.Player.getLocation().getDirection().multiply(superActive ? 0.9 : 0.7).add(new Vector(0,0.15,0)));
 				data.Player.getWorld().playSound(data.Player.getLocation(), Sound.EXPLODE, 0.6f, 1.2f);
 				
 				if (_tick == 0)
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameDash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameDash.java
index fd0222205..041bae71c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameDash.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameDash.java
@@ -13,6 +13,7 @@ import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilParticle;
@@ -123,7 +124,7 @@ public class PerkFlameDash extends Perk
 				vel.normalize();
 				vel.setY(0.05);
 
-				data.Player.setVelocity(vel);
+				UtilAction.velocity(data.Player, vel);
 				
 				//Sound
 				data.Player.getWorld().playSound(data.Player.getLocation(), Sound.FIZZ, 0.6f, 1.2f);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameSlam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameSlam.java
index 5c17248c1..9db75a2b2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameSlam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlameSlam.java
@@ -100,7 +100,7 @@ public class PerkFlameSlam extends Perk
 			Vector vel = player.getLocation().getDirection();
 			vel.setY(0);
 			UtilAlg.Normalize(vel);
-			player.setVelocity(vel.multiply(0.8));
+			UtilAction.velocity(player, vel.multiply(0.8));
 			
 			//Particle
 			UtilParticle.PlayParticle(ParticleType.FLAME, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 5,
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFleshArrow.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFleshArrow.java
index 5039514ff..e0eb24ebd 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFleshArrow.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFleshArrow.java
@@ -92,7 +92,7 @@ public class PerkFleshArrow extends SmashPerk
 		
 		Manager.GetCondition().Factory().Slow(GetName(), ent, event.GetDamagerEntity(true), 4, 3, false, false, false, false);
 		
-		ent.setVelocity(new Vector(0,-0.5,0));
+		UtilAction.velocity(ent, new Vector(0,-0.5,0));
 	}
 
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
index 61b79625a..bc1bbd109 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkIcePath.java
@@ -13,6 +13,7 @@ import org.bukkit.util.Vector;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.recharge.Recharge;
@@ -59,7 +60,7 @@ public class PerkIcePath extends Perk
 		if (!Recharge.Instance.use(player, GetName(), 12000, true, true))
 			return;
 		
-		player.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(player);
 		player.teleport(player.getLocation().add(0, 0.75, 0));
 		
 		_data.add(new IcePathData(player));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSnowTurret.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSnowTurret.java
index 8a52c396c..029ef5bf4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSnowTurret.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSnowTurret.java
@@ -132,7 +132,7 @@ public class PerkSnowTurret extends SmashPerk
 		if (damagee.equals(_snowball.get(proj)))
 			return;
 
-		damagee.setVelocity(proj.getVelocity().multiply(0.3).add(new Vector(0, 0.3, 0)));
+		UtilAction.velocity(damagee, proj.getVelocity().multiply(0.3).add(new Vector(0, 0.3, 0)));
 
 		//Damage Event
 		if (!(damagee instanceof LivingEntity))
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpiderLeap.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpiderLeap.java
index 5106fa728..f2e8b18b1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpiderLeap.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSpiderLeap.java
@@ -73,7 +73,7 @@ public class PerkSpiderLeap extends Perk
 			{
 				if (!UtilBlock.airFoliage(block) && !block.isLiquid())
 				{
-					player.setVelocity(new Vector(0,0.2,0));
+					UtilAction.velocity(player, new Vector(0, 0.2, 0));
 					
 					if (!_secondJump.contains(player))
 					{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkTakedown.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkTakedown.java
index 4d181426d..040155793 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkTakedown.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkTakedown.java
@@ -112,7 +112,7 @@ public class PerkTakedown extends Perk
 				DamageCause.CUSTOM, 8, true, true, false,
 				damager.getName(), GetName());	
 		
-		damager.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(damager);
 
 		//Inform
 		UtilPlayer.message(damager, F.main("Game", "You hit " + F.name(UtilEnt.getName(damagee)) + " with " + F.skill(GetName()) + "."));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
index 699067767..b51869b2f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWebShot.java
@@ -100,7 +100,7 @@ public class PerkWebShot extends SmashPerk implements IThrown
 					DamageCause.PROJECTILE, 6, false, false, false,
 					UtilEnt.getName(data.GetThrower()), GetName());
 			
-			target.setVelocity(new Vector(0,0,0));
+			UtilAction.zeroVelocity(target);
 			
 			return;
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolf.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolf.java
index 8877ef3a5..57a79f2f9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolf.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolf.java
@@ -152,7 +152,7 @@ public class PerkWolf extends SmashPerk
 		_tackle.put(wolf, damagee);
 
 		wolf.setVelocity(new Vector(0,-0.6,0));
-		damagee.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(damagee);
 
 		//Damage
 		Manager.GetDamage().NewDamageEvent(damagee, damager, null, 
@@ -190,7 +190,7 @@ public class PerkWolf extends SmashPerk
 			if (UtilMath.offset(wolf, ent) < 2.5)
 			{
 				Manager.GetCondition().Factory().Slow("Cub Table", ent, wolf, 0.9, 1, false, false, false, false);
-				ent.setVelocity(new Vector(0,-0.3,0));
+				UtilAction.velocity(ent, new Vector(0,-0.3,0));
 			}
 				
 			//Move
@@ -305,7 +305,7 @@ public class PerkWolf extends SmashPerk
 
 	public void StrikeHit(Player damager, LivingEntity damagee)
 	{
-		damager.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(damager);
 
 		//Remove Tackle
 		Iterator<Wolf> wolfIterator = _tackle.keySet().iterator();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPack.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPack.java
index 384ba20bb..b0255ff8b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPack.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPack.java
@@ -538,7 +538,7 @@ public class PerkWolfPack extends Perk
 
 	public void TackleHit(Player damager, LivingEntity damagee)
 	{
-		damager.setVelocity(new Vector(0,0,0));
+		UtilAction.zeroVelocity(damager);
 		
 		Manager.GetDamage().NewDamageEvent(damagee, damager, null, 
 				DamageCause.CUSTOM, 7, false, true, false,
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
index dafbc7416..759ab84d2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
@@ -696,7 +696,7 @@ public class GameFlagManager implements Listener
 				public void run()
 				{
 					player.setFireTicks(0);
-					player.setVelocity(new Vector(0,0,0));
+					UtilAction.zeroVelocity(player);
 				}
 			}, 0);
 		}
@@ -745,7 +745,7 @@ public class GameFlagManager implements Listener
 					}
 					 
 					player.setFireTicks(0);
-					player.setVelocity(new Vector(0,0,0));
+					UtilAction.zeroVelocity(player);
 				}
 			}, (int)(time * 20d));
 		}	

From 638406254b552533da72c45f2619e6bc63d2cc8c Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 2 Aug 2015 12:07:00 +0200
Subject: [PATCH 102/113] refactored a little so theres no data stored in the
 util

---
 .../mineplex/core/common/util/UtilAction.java | 12 +++++-----
 .../core/common/util/VelocityReceiver.java    |  9 ++++++++
 .../mineplex/core/velocity/VelocityFix.java   | 23 +++++++++++++++----
 3 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/VelocityReceiver.java

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index 0d603ac7b..8c8324723 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -6,16 +6,16 @@ import org.bukkit.util.Vector;
 
 public class UtilAction
 {
-	private static NautHashMap<Player, Vector> _velocityFix = new NautHashMap<Player,Vector>();
+	private static VelocityReceiver _velocityFix;
 
 	public static void velocity(Entity ent, Vector vec) 
 	{
 		velocity(ent, vec, 1, false, 0, 0, vec.length(), false);
 	}
 	
-	public static NautHashMap<Player, Vector> getVelocityData()
+	public static void registerVelocityFix(VelocityReceiver velocityFix) 
 	{
-		return _velocityFix;
+		_velocityFix = velocityFix;
 	}
 
 	public static void velocity(Entity ent, double str, double yAdd, double yMax, boolean groundBoost)
@@ -56,7 +56,7 @@ public class UtilAction
 		//Store It!
 		if (ent instanceof Player)
 		{
-			_velocityFix.put(((Player)ent), vec);
+			_velocityFix.setPlayerVelocity(((Player)ent), vec);
 		}
 
 		ent.setVelocity(vec);
@@ -70,11 +70,11 @@ public class UtilAction
 		//Store It!
 		if (ent instanceof Player)
 		{
-			_velocityFix.put(((Player)ent), vec);
+			_velocityFix.setPlayerVelocity(((Player)ent), vec);
 		}
 
 		ent.setVelocity(vec);	
 	}
 
-
+	
 }
diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/VelocityReceiver.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/VelocityReceiver.java
new file mode 100644
index 000000000..8d621dab8
--- /dev/null
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/VelocityReceiver.java
@@ -0,0 +1,9 @@
+package mineplex.core.common.util;
+
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+public interface VelocityReceiver 
+{
+	public void setPlayerVelocity(Player player, Vector velocity);
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
index f06ba4cf2..7649f3431 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/velocity/VelocityFix.java
@@ -3,7 +3,9 @@ package mineplex.core.velocity;
 import java.util.Iterator;
 
 import mineplex.core.MiniPlugin;
+import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.VelocityReceiver;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 
@@ -13,8 +15,9 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerVelocityEvent;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
 
-public class VelocityFix extends MiniPlugin
+public class VelocityFix extends MiniPlugin implements VelocityReceiver
 {
 	/*
 	 * The purpose of this class is to fix a bug inherent in Minecraft, 
@@ -28,22 +31,32 @@ public class VelocityFix extends MiniPlugin
 	 * 
 	 */
 	
+	private NautHashMap<Player, Vector> _velocityData = new NautHashMap<Player,Vector>();
+	
 	public VelocityFix(JavaPlugin plugin)
 	{
 		super("Velocity Fix", plugin);
+		
+		UtilAction.registerVelocityFix(this);
+	}
+	
+	@Override
+	public void setPlayerVelocity(Player player, Vector velocity) 
+	{
+		_velocityData.put(player, velocity);
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void fixVelocity(PlayerVelocityEvent event)
 	{
-		if (UtilAction.getVelocityData().containsKey(event.getPlayer()))
-			event.getPlayer().setVelocity(UtilAction.getVelocityData().remove(event.getPlayer()));
+		if (_velocityData.containsKey(event.getPlayer()))
+			event.getPlayer().setVelocity(_velocityData.remove(event.getPlayer()));
 	}
 	
 	@EventHandler
 	public void cleanVelocity(PlayerQuitEvent event)
 	{
-		UtilAction.getVelocityData().remove(event.getPlayer());
+		_velocityData.remove(event.getPlayer());
 	}
 	
 	@EventHandler
@@ -52,7 +65,7 @@ public class VelocityFix extends MiniPlugin
 		if (event.getType() != UpdateType.SLOW)
 			return;
 		
-		Iterator<Player> keyIter = UtilAction.getVelocityData().keySet().iterator();
+		Iterator<Player> keyIter = _velocityData.keySet().iterator();
 		
 		while (keyIter.hasNext())
 		{

From 8ea967b37ec8c077f2557614ae600d1759b2489d Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 2 Aug 2015 12:35:25 +0200
Subject: [PATCH 103/113] fixed possible NPE

---
 .../src/mineplex/core/common/util/UtilAction.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
index 8c8324723..9f3ba3614 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java
@@ -54,7 +54,7 @@ public class UtilAction
 		ent.setFallDistance(0);
 
 		//Store It!
-		if (ent instanceof Player)
+		if (ent instanceof Player && _velocityFix != null)
 		{
 			_velocityFix.setPlayerVelocity(((Player)ent), vec);
 		}
@@ -68,7 +68,7 @@ public class UtilAction
 		ent.setFallDistance(0);
 
 		//Store It!
-		if (ent instanceof Player)
+		if (ent instanceof Player && _velocityFix != null)
 		{
 			_velocityFix.setPlayerVelocity(((Player)ent), vec);
 		}

From 612d967aa00ef093e1e9313323057f9470061965 Mon Sep 17 00:00:00 2001
From: Ty Sayers <tasayers@uwaterloo.ca>
Date: Sun, 2 Aug 2015 13:24:59 -0400
Subject: [PATCH 104/113] Add ability for auto-joining of gametypes to bypass
 manual server selection by player.

---
 .../src/mineplex/hub/server/ServerInfo.java   |  5 ++
 .../mineplex/hub/server/ServerManager.java    | 68 +++++++++++++++++++
 .../hub/server/ui/ServerCountSorter.java      | 13 ++++
 .../hub/server/ui/ServerGameMenu.java         |  2 +-
 .../mineplex/hub/server/ui/ServerNpcPage.java |  2 +-
 .../mineplex/hub/server/ui/ServerNpcShop.java | 25 +++++++
 .../serverdata/servers/ServerManager.java     |  2 +-
 7 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerCountSorter.java

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerInfo.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerInfo.java
index a9dcdccba..235b7c99b 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerInfo.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerInfo.java
@@ -10,4 +10,9 @@ public class ServerInfo
 	public String ServerType;
 	public String Game;
 	public boolean HostedByStaff;
+	
+	public int getAvailableSlots()
+	{
+		return MaxPlayers - CurrentPlayers;
+	}
 }
\ No newline at end of file
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index bba026899..0e4e310b9 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -10,6 +10,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 
 import org.bukkit.ChatColor;
@@ -56,6 +57,7 @@ import mineplex.hub.queue.QueueManager;
 import mineplex.hub.queue.ui.QueueShop;
 import mineplex.hub.server.ui.LobbyShop;
 import mineplex.hub.server.ui.QuickShop;
+import mineplex.hub.server.ui.ServerCountSorter;
 import mineplex.hub.server.ui.ServerNpcShop;
 import mineplex.serverdata.data.MinecraftServer;
 import mineplex.serverdata.data.ServerGroup;
@@ -64,6 +66,10 @@ public class ServerManager extends MiniPlugin
 {
 	private static final Long FREE_PORTAL_TIMER = 20000L;
 	private static final Long BETA_PORTAL_TIMER = 120000L;
+	private static final Random random = new Random();
+
+	public final int TOP_SERVERS = 3;			// The number of top contending servers for auto-joining games
+	public final int MIN_SLOTS_REQUIRED = 12;	// The number of slots the max server must have for auto-join
 
 	private CoreClientManager _clientManager;
 	private DonationManager _donationManager;
@@ -521,6 +527,68 @@ public class ServerManager extends MiniPlugin
 			_portal.sendPlayerToServer(player, serverInfo.Name);
 		}
 	}
+	
+	/**
+	 * Select a {@code serverType} for a {@code player} that wishes to automatically join the best server
+	 * available for that server type.
+	 * @param player - the player hoping to select a server
+	 * @param serverType - the name of the type of server to be joined
+	 */
+	public void selectServer(Player player, String serverType)
+	{
+		ServerInfo bestServer = getBestServer(player, serverType);
+
+		if (bestServer != null)
+		{
+			SelectServer(player, bestServer);
+		}
+	}
+	
+	/**
+	 * @param serverType - the type of server that should be fetched
+	 * @return the best server that a new player should join according to a {@code serverType} constraint.
+	 */
+	public ServerInfo getBestServer(Player player, String serverType)
+	{
+		List<ServerInfo> servers = new ArrayList<ServerInfo>(GetServerList(serverType));
+		Collections.sort(servers, new ServerCountSorter());
+		servers = fetchOpenServers(player, servers, servers.size());	// Removes all full servers from list
+
+		int count = Math.min(servers.size(), TOP_SERVERS);
+		if (count > 0)
+		{
+			ServerInfo largestServer = servers.get(0);
+			
+			if (largestServer.getAvailableSlots() >= MIN_SLOTS_REQUIRED)
+			{
+				return largestServer;
+			}
+			else
+			{
+				return servers.get(random.nextInt(count));
+			}
+		}
+		
+		return null;
+	}
+	
+	public List<ServerInfo> fetchOpenServers(Player player, List<ServerInfo> servers, int count)
+	{
+		List<ServerInfo> results = new ArrayList<ServerInfo>();
+		int requiredSlots = (servers.size() > 0) ? GetRequiredSlots(player, servers.get(0).ServerType) : 0;
+		
+		for (ServerInfo server : servers)
+		{
+			if (results.size() >= count) break;
+			
+			if (server.getAvailableSlots() > requiredSlots)
+			{
+				results.add(server);
+			}
+		}
+		
+		return results;
+	}
 
 	public void ListServerNpcs(Player caller)
 	{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerCountSorter.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerCountSorter.java
new file mode 100644
index 000000000..91065658c
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerCountSorter.java
@@ -0,0 +1,13 @@
+package mineplex.hub.server.ui;
+
+import java.util.Comparator;
+
+import mineplex.hub.server.ServerInfo;
+
+public class ServerCountSorter implements Comparator<ServerInfo>
+{	
+	public int compare(ServerInfo a, ServerInfo b)
+	{
+		return a.CurrentPlayers - b.CurrentPlayers;
+	}
+}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
index 47a0e34d0..f63540cbf 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
@@ -72,7 +72,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Stay away from the borders!",
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("HG") + ChatColor.RESET + " other players!",
-				}));
+				})); 
 
 		setItem(4, ItemStackFactory.Instance.CreateStack(Material.FEATHER.getId(), (byte) 0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Skywars " + C.cGray + "Solo Survival", new String[]
 				{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
index b44045870..95922d3a7 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
@@ -401,7 +401,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 	{		
 		int slots = getPlugin().GetRequiredSlots(player, serverInfo.ServerType);
 		
-		if (serverInfo.MaxPlayers - serverInfo.CurrentPlayers < slots && !(getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || getClient().GetRank().Has(Rank.ULTRA)))
+		if (serverInfo.getAvailableSlots() < slots && !(getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(serverInfo.ServerType + " ULTRA") || getClient().GetRank().Has(Rank.ULTRA)))
 		{
 			playDenySound(player);
 			return;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
index 0c4af2d90..2d2e567f0 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
@@ -65,4 +65,29 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 	{ 
 		getPlugin().getHubManager().GetVisibility().removeHiddenPlayer(player);
 	}
+
+	@Override
+	public boolean attemptShopOpen(Player player)
+    {
+		return super.attemptShopOpen(player);
+		/*if (!_openedShop.contains(player.getName()))
+		{
+			if (!canOpenShop(player))
+				return false;
+			
+			_openedShop.add(player.getName());
+			
+    		openShopForPlayer(player);
+    		if (!_playerPageMap.containsKey(player.getName()))
+    		{
+    			_playerPageMap.put(player.getName(), buildPagesFor(player));
+    		}
+    		
+    		openPageForPlayer(player, getOpeningPageForPlayer(player));
+    		
+    		return true;
+		}
+		
+		return false;*/
+    }
 }
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerManager.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerManager.java
index 1c173ae09..fbf5d563b 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerManager.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/servers/ServerManager.java
@@ -28,7 +28,7 @@ public class ServerManager
 	
 	// The cached repository instances
 	private static Map<Region, ServerRepository> repositories = new HashMap<Region, ServerRepository>();
-	
+	 
 	/**
 	 * @param host - the host url used to connect to the database
 	 * @param port - the port to connect to the repository

From 0a84bd69d89582b54616518dde568be09630e057 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 2 Aug 2015 23:17:23 +0200
Subject: [PATCH 105/113] fixed some OITQ stuff

---
 .../game/arcade/game/games/quiver/Quiver.java |  2 +
 .../game/arcade/kit/perks/PerkVanishing.java  | 74 +++++++++++--------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
index cc3012ad4..2bffb2d60 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
@@ -80,6 +80,8 @@ public class Quiver extends SoloGame
 		this.BlockBreakAllow.add(102);
 		this.BlockBreakAllow.add(20);
 		
+		this.DeathSpectateSecs = 2;
+		
 		_scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy");
 		_scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java
index cc09980fa..919f4ffdf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkVanishing.java
@@ -1,12 +1,16 @@
 package nautilus.game.arcade.kit.perks;
 
+import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
+import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
+import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.kit.Perk;
 
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -16,8 +20,8 @@ public class PerkVanishing extends Perk
 	{
 		super("Vanishing Act", new String[]
 				{
-				"Become invisible for two seconds after a melee kill.",
-				"You will lose invisibility if you attack or charge your bow."
+				"Become invisible for 2 seconds each kill.",
+				"Attacking with melee removes invisibility."
 				});
 	}
 
@@ -27,9 +31,9 @@ public class PerkVanishing extends Perk
 		if (!Manager.GetGame().IsLive())
 			return;
 		
-		//If it's an arrow kill (OITQ)
-		if (!event.GetLog().GetKiller().GetReason().toLowerCase().contains("instagib"))
-			return;
+//		//If it's an arrow kill (OITQ)
+//		if (!event.GetLog().GetKiller().GetReason().toLowerCase().contains("instagib"))
+//			return;
 		
 		if (!event.GetLog().GetKiller().IsPlayer())
 			return;
@@ -46,14 +50,25 @@ public class PerkVanishing extends Perk
 			return;
 		
 		Manager.GetCondition().Factory().Cloak("Vanishing Act", killer, null, 2, false, true);
+		
+		UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, killer.getLocation().add(0, 1, 0), 0, 0, 0, 0, 1, ViewDist.LONG, UtilServer.getPlayers());
+		
+		killer.getWorld().playSound(killer.getLocation(), Sound.FIZZ, 1f, 2f);
 	}
 	
 	@EventHandler
 	public void remove(CustomDamageEvent event)
 	{
+		if (event.isCancelled())
+			return;
+		
 		if (!Manager.GetGame().IsLive())
 			return;
 		
+		//Arrow damage, ignore it!
+		if (event.GetDamage() > 10)
+			return;
+		
 		Player damager = event.GetDamagerPlayer(true);
 		
 		if (damager == null)
@@ -65,29 +80,28 @@ public class PerkVanishing extends Perk
 		if (!Kit.HasKit(damager))
 			return;
 		
-		if (Manager.GetCondition().IsCloaked(damager))
-			Manager.GetCondition().Clean(damager);
+		Manager.GetCondition().EndCondition(damager, ConditionType.CLOAK, null);
 	}
 	
-	@EventHandler
-	public void remove(UpdateEvent event)
-	{
-		if (event.getType() != UpdateType.TICK)
-			return;
-		
-		if (!Manager.GetGame().IsLive())
-			return;
-		
-		for (Player player : Manager.GetGame().GetPlayers(true))
-		{
-			if (!Kit.HasKit(player))
-				continue;
-			
-			if (!UtilPlayer.isChargingBow(player))
-				continue;
-			
-			if (Manager.GetCondition().IsCloaked(player))
-				Manager.GetCondition().Clean(player);
-		}
-	}
+//	@EventHandler
+//	public void remove(UpdateEvent event)
+//	{
+//		if (event.getType() != UpdateType.TICK)
+//			return;
+//		
+//		if (!Manager.GetGame().IsLive())
+//			return;
+//		
+//		for (Player player : Manager.GetGame().GetPlayers(true))
+//		{
+//			if (!Kit.HasKit(player))
+//				continue;
+//			
+//			if (!UtilPlayer.isChargingBow(player))
+//				continue;
+//			
+//			if (Manager.GetCondition().IsCloaked(player))
+//				Manager.GetCondition().Clean(player);
+//		}
+//	}
 }

From 70c1b883db9df7785bd0576cee4123e469edb84c Mon Sep 17 00:00:00 2001
From: Ty Sayers <tasayers@uwaterloo.ca>
Date: Sun, 2 Aug 2015 18:20:52 -0400
Subject: [PATCH 106/113] Fix bug with NPC server shops not properly calling
 the central method used for intervening and auto-joining. Also add in base
 for team/solo separation for specific server groups.

---
 .../src/mineplex/core/npc/NpcManager.java     |  2 +-
 .../src/mineplex/core/shop/ShopBase.java      | 21 +++---------
 .../core/status/ServerStatusManager.java      | 19 ++---------
 .../mineplex/hub/server/ServerManager.java    |  9 ++++--
 .../mineplex/hub/server/ui/ServerNpcShop.java | 32 ++++++++-----------
 5 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
index 6b7eb9053..e58b10020 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
@@ -484,7 +484,7 @@ public class NpcManager extends MiniPlugin
 		String serverType = getServerName();
 
 		try (Connection connection = DBPool.ACCOUNT.getConnection())
-		{
+		{ 
 			Result<NpcsRecord> result = DSL.using(connection)
 					.selectFrom(Tables.npcs)
 					.where(Tables.npcs.server.eq(serverType))
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
index c63e2c6b3..0452a13cb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
@@ -87,23 +87,10 @@ public abstract class ShopBase<PluginType extends MiniPlugin> implements Listene
     
     private boolean attemptShopOpen(Player player, LivingEntity entity)
     {
-		if (!_openedShop.contains(player.getName()) && entity.isCustomNameVisible() && entity.getCustomName() != null && ChatColor.stripColor(entity.getCustomName()).equalsIgnoreCase(ChatColor.stripColor(_name)))
-		{
-			if (!canOpenShop(player))
-				return false;
-			
-			_openedShop.add(player.getName());
-			
-    		openShopForPlayer(player);
-    		if (!_playerPageMap.containsKey(player.getName()))
-    		{
-    			_playerPageMap.put(player.getName(), buildPagesFor(player));
-    		}
-    		
-    		openPageForPlayer(player, getOpeningPageForPlayer(player));
-    		
-    		return true;
-		}
+    	if (entity.isCustomNameVisible() && entity.getCustomName() != null && ChatColor.stripColor(entity.getCustomName()).equalsIgnoreCase(ChatColor.stripColor(_name)))
+    	{
+    		return attemptShopOpen(player);
+    	}
 		
 		return false;
     }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
index 2033584ba..520d2417e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
@@ -116,10 +116,8 @@ public class ServerStatusManager extends MiniPlugin
 		if (event.getType() != UpdateType.FASTER)
 			return;
 		
-		if (!_enabled)
-			return;
-				
-		saveServerStatus();
+		if (_enabled)
+			saveServerStatus();
 	}
 	
 	/**
@@ -139,19 +137,6 @@ public class ServerStatusManager extends MiniPlugin
 				if (server != null && !server.getPublicAddress().equalsIgnoreCase(serverSnapshot.getPublicAddress()))
 				{
 					timeout = -DEFAULT_SERVER_TIMEOUT;
-					/*
-					ProcessRunner pr = new ProcessRunner(new String[] {"/bin/sh", "/home/mineplex/config/killServer.sh", serverSnapshot.getName()});
-					pr.start(new GenericRunnable<Boolean>()
-					{
-						public void run(Boolean error)
-						{
-							if (error)
-								log("Error Killing myself.");
-							else
-								log("It worked.");
-						}
-					});
-					*/
 				}
 						
 				_repository.updataServerStatus(serverSnapshot, timeout);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index 0e4e310b9..beda010d6 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -320,7 +320,11 @@ public class ServerManager extends MiniPlugin
 	public void AddServerNpc(String serverNpcName, String...serverTag)
 	{
 		addServerGroup(serverNpcName, serverTag);
-		_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, serverNpcName));
+		
+		// TODO: Determine whether server group is team based or not
+		boolean teamBased = false;
+		
+		_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, serverNpcName, teamBased));
 	}
 	
 	public void RemoveServerNpc(String serverNpcName)
@@ -402,7 +406,6 @@ public class ServerManager extends MiniPlugin
 		
 		_retrieving = true;
 		
-		
 		_statusManager.retrieveServerGroups(new Callback<Collection<ServerGroup>>()
 		{
 			public void run(final Collection<ServerGroup> serverGroups)
@@ -551,10 +554,12 @@ public class ServerManager extends MiniPlugin
 	public ServerInfo getBestServer(Player player, String serverType)
 	{
 		List<ServerInfo> servers = new ArrayList<ServerInfo>(GetServerList(serverType));
+		
 		Collections.sort(servers, new ServerCountSorter());
 		servers = fetchOpenServers(player, servers, servers.size());	// Removes all full servers from list
 
 		int count = Math.min(servers.size(), TOP_SERVERS);
+		
 		if (count > 0)
 		{
 			ServerInfo largestServer = servers.get(0);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
index 2d2e567f0..bc0504798 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
@@ -14,9 +14,13 @@ import mineplex.hub.server.ServerManager;
 
 public class ServerNpcShop extends ShopBase<ServerManager>
 {	
-	public ServerNpcShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager, String name)
+	private boolean _teamBased;	// Whether this server type has a team/solo based component
+	
+	public ServerNpcShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager, String name, boolean teamBased)
 	{
 		super(plugin, clientManager, donationManager, name);
+		
+		_teamBased = teamBased;
 	}
 
 	@Override
@@ -69,25 +73,15 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 	@Override
 	public boolean attemptShopOpen(Player player)
     {
-		return super.attemptShopOpen(player);
-		/*if (!_openedShop.contains(player.getName()))
+		if (!_teamBased)	// Check this isn't a team/solo gametype shop
 		{
-			if (!canOpenShop(player))
-				return false;
-			
-			_openedShop.add(player.getName());
-			
-    		openShopForPlayer(player);
-    		if (!_playerPageMap.containsKey(player.getName()))
-    		{
-    			_playerPageMap.put(player.getName(), buildPagesFor(player));
-    		}
-    		
-    		openPageForPlayer(player, getOpeningPageForPlayer(player));
-    		
-    		return true;
+			getPlugin().selectServer(player, getName());
+			return false;
+		}
+		else
+		{
+			// TODO: Open up team/solo selection menu and then select appropriate server
+			return super.attemptShopOpen(player);
 		}
-		
-		return false;*/
     }
 }

From f520908f8d4c73c04684286071ef83cb2a8002cb Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sun, 2 Aug 2015 17:52:51 -0500
Subject: [PATCH 107/113] Added team and portal location info to server group.

---
 .../mineplex/serverdata/data/ServerGroup.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
index 40d36f875..b018383b7 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
@@ -57,6 +57,11 @@ public class ServerGroup
 	private boolean _staffOnly;
 	private String _resourcePack = "";
 	
+	private String _portalBottomCornerLocation = "";
+	private String _portalTopCornerLocation = "";
+	
+	private String _teamServerKey = "";
+	
 	private Region _region;
 	
 	private Set<MinecraftServer> _servers;
@@ -101,6 +106,9 @@ public class ServerGroup
 		_resourcePack = data.containsKey("resourcePack") ? data.get("resourcePack") : "";
 		_host = data.get("host");
 		_region = data.containsKey("region") ? Region.valueOf(data.get("region")) : Region.ALL;
+		_teamServerKey = data.containsKey("teamServerKey") ? data.get("teamServerKey") : "";
+		_portalBottomCornerLocation = data.containsKey("portalBottomCornerLocation") ? data.get("portalBottomCornerLocation") : "";
+		_portalTopCornerLocation = data.containsKey("portalTopCornerLocation") ? data.get("portalTopCornerLocation") : "";
 		
 		if (serverStatuses != null)
 			parseServers(serverStatuses);
@@ -109,7 +117,8 @@ public class ServerGroup
 	public ServerGroup(String name, String prefix, String host, int ram, int cpu, int totalServers, int joinable, int portSection, boolean arcade, String worldZip, String plugin, String configPath
 			, int minPlayers, int maxPlayers, boolean pvp, boolean tournament, boolean tournamentPoints, String games, String serverType, boolean noCheat, boolean worldEdit, boolean teamRejoin
 			, boolean teamAutoJoin, boolean teamForceBalance, boolean gameAutoStart, boolean gameTimeout, boolean rewardGems, boolean rewardItems, boolean rewardStats
-			, boolean rewardAchievements, boolean hotbarInventory, boolean hotbarHubClock, boolean playerKickIdle, boolean staffOnly, boolean whitelist, String resourcePack, Region region)
+			, boolean rewardAchievements, boolean hotbarInventory, boolean hotbarHubClock, boolean playerKickIdle, boolean staffOnly, boolean whitelist, String resourcePack, Region region
+			, String teamServerKey, String portalBottomCornerLocation, String portalTopCornerLocation)
 	{
 		_name = name;
 		_prefix = prefix;
@@ -148,6 +157,9 @@ public class ServerGroup
 		_whitelist = whitelist;
 		_resourcePack = resourcePack;
 		_region = region;
+		_teamServerKey = teamServerKey;
+		_portalBottomCornerLocation = portalBottomCornerLocation;
+		_portalTopCornerLocation = portalTopCornerLocation;
 	}
 	
 	public String getName() { return _name; }
@@ -196,6 +208,11 @@ public class ServerGroup
 	public String getResourcePack() { return _resourcePack; }	
 	public Region getRegion() { return _region; }
 	
+	public String getTeamServerKey() { return _teamServerKey; }
+	
+	public String getPortalBottomCornerLocation() { return _portalBottomCornerLocation; }
+	public String getPortalTopCornerLocation() { return _portalTopCornerLocation; }
+	
 	public Set<MinecraftServer> getServers() { return _servers; }
 	
 	public int getServerCount()
@@ -350,6 +367,9 @@ public class ServerGroup
 			_dataMap.put("resourcePack", _resourcePack);
 			_dataMap.put("host", _host);
 			_dataMap.put("region", _region.name());
+			_dataMap.put("teamServerKey", _teamServerKey);
+			_dataMap.put("portalBottomCornerLocation", _portalBottomCornerLocation);
+			_dataMap.put("portalTopCornerLocation", _portalTopCornerLocation);
 		}
 		
 		return _dataMap;

From 4852e6999185e4459074d42de0a3a014d2b6273c Mon Sep 17 00:00:00 2001
From: Ty Sayers <tasayers@uwaterloo.ca>
Date: Sun, 2 Aug 2015 19:19:40 -0400
Subject: [PATCH 108/113] Temporary un-finished changes for adding in team/solo
 UI pages and allowing players to select.

---
 .../mineplex/hub/server/ServerManager.java    |  2 +-
 .../mineplex/hub/server/ui/ServerNpcPage.java | 18 +++-
 .../mineplex/hub/server/ui/ServerNpcShop.java | 20 ++---
 .../hub/server/ui/ServerTypePage.java         | 89 +++++++++++++++++++
 .../server/ui/button/SelectTypeButton.java    | 28 ++++++
 5 files changed, 144 insertions(+), 13 deletions(-)
 create mode 100644 Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
 create mode 100644 Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectTypeButton.java

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index beda010d6..d09791def 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -324,7 +324,7 @@ public class ServerManager extends MiniPlugin
 		// TODO: Determine whether server group is team based or not
 		boolean teamBased = false;
 		
-		_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, serverNpcName, teamBased));
+		_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, null));
 	}
 	
 	public void RemoveServerNpc(String serverNpcName)
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
index 95922d3a7..298752e55 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
@@ -17,6 +17,7 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.donation.DonationManager;
 import mineplex.core.game.GameDisplay;
+import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.shop.item.IButton;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.shop.page.ShopPageBase;
@@ -41,7 +42,7 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 
 	public ServerNpcPage(ServerManager plugin, ServerNpcShop shop, CoreClientManager clientManager,	DonationManager donationManager, String name, Player player, String serverNpcKey)
 	{
-		super(plugin, shop, clientManager, donationManager, name, player, 54);
+		super(plugin, shop, clientManager, donationManager, name, player, 27);
 		
 		_serverNpcKey = serverNpcKey;
 
@@ -51,6 +52,21 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 	@Override
 	protected void buildPage()
 	{
+		setItem(12, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Solo " + C.cGray + getName(), new String[]
+				{ 
+			ChatColor.RESET + "Solo Mode",
+			ChatColor.RESET + "",
+			ChatColor.RESET + "Click to play!",
+			ChatColor.RESET + "",
+			ChatColor.RESET + "Teaming in Solo Mode is bannable!",
+				}));
+		
+		setItem(14, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 2, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Team " + C.cGray + getName(), new String[]
+				{ 
+					ChatColor.RESET + "Team Mode",
+					ChatColor.RESET + "",
+					ChatColor.RESET + "Click to play!"
+				}));
 		List<ServerInfo> serverList = new ArrayList<ServerInfo>(getPlugin().GetServerList(_serverNpcKey));
 		int slotsNeeded = 1;
 
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
index bc0504798..5f97c10b6 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
@@ -11,22 +11,23 @@ import mineplex.core.party.Party;
 import mineplex.core.shop.ShopBase;
 import mineplex.core.shop.page.ShopPageBase;
 import mineplex.hub.server.ServerManager;
+import mineplex.serverdata.data.ServerGroup;
 
 public class ServerNpcShop extends ShopBase<ServerManager>
 {	
-	private boolean _teamBased;	// Whether this server type has a team/solo based component
+	private ServerGroup _serverGroup;
 	
-	public ServerNpcShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager, String name, boolean teamBased)
+	public ServerNpcShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager, ServerGroup serverGroup)
 	{
-		super(plugin, clientManager, donationManager, name);
+		super(plugin, clientManager, donationManager, serverGroup.getName());
 		
-		_teamBased = teamBased;
+		_serverGroup = serverGroup;
 	}
 
 	@Override
 	protected ShopPageBase<ServerManager, ? extends ShopBase<ServerManager>> buildPagesFor(Player player)
 	{
-		return new ServerNpcPage(getPlugin(), this, getClientManager(), getDonationManager(), getName(), player, getName());
+		return new ServerTypePage(getPlugin(), this, getClientManager(), getDonationManager(), player, _serverGroup);
 	}
 
 	@Override
@@ -73,15 +74,12 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 	@Override
 	public boolean attemptShopOpen(Player player)
     {
-		if (!_teamBased)	// Check this isn't a team/solo gametype shop
+		if (true)	// TODO: Check to see if _serverGroup's teamKey field is null
 		{
 			getPlugin().selectServer(player, getName());
 			return false;
 		}
-		else
-		{
-			// TODO: Open up team/solo selection menu and then select appropriate server
-			return super.attemptShopOpen(player);
-		}
+
+		return super.attemptShopOpen(player);
     }
 }
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
new file mode 100644
index 000000000..30a6bee83
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
@@ -0,0 +1,89 @@
+package mineplex.hub.server.ui;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.meta.SkullMeta;
+
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.achievement.AchievementCategory;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.donation.DonationManager;
+import mineplex.core.game.GameDisplay;
+import mineplex.core.itemstack.ItemStackFactory;
+import mineplex.core.shop.item.IButton;
+import mineplex.core.shop.item.ShopItem;
+import mineplex.core.shop.page.ShopPageBase;
+import mineplex.hub.server.ServerInfo;
+import mineplex.hub.server.ServerManager;
+import mineplex.hub.server.ServerSorter;
+import mineplex.hub.server.ui.button.JoinServerButton;
+import mineplex.hub.server.ui.button.SelectBRButton;
+import mineplex.hub.server.ui.button.SelectTypeButton;
+import mineplex.serverdata.data.ServerGroup;
+
+public class ServerTypePage extends ShopPageBase<ServerManager, ServerNpcShop>
+{
+
+	private ServerGroup _serverGroup;
+
+	public ServerTypePage(ServerManager plugin, ServerNpcShop shop, CoreClientManager clientManager, DonationManager donationManager, 
+							Player player, ServerGroup serverGroup)
+	{
+		super(plugin, shop, clientManager, donationManager, serverGroup.getName(), player, 27);
+		
+		_serverGroup = serverGroup;
+
+		buildPage();
+	}
+
+	@Override
+	protected void buildPage()
+	{
+		String name = _serverGroup.getName();
+		
+		setItem(12, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Solo " + C.cGray + name, new String[]
+				{ 
+			ChatColor.RESET + "Solo Mode",
+			ChatColor.RESET + "",
+			ChatColor.RESET + "Click to play!",
+			ChatColor.RESET + "",
+			ChatColor.RESET + "Teaming in Solo Mode is bannable!",
+				}));
+		
+		setItem(14, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 2, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Team " + C.cGray + name, new String[]
+				{ 
+					ChatColor.RESET + "Team Mode",
+					ChatColor.RESET + "",
+					ChatColor.RESET + "Click to play!"
+				}));
+		
+		getButtonMap().put(12, new SelectTypeButton(this, false));
+		getButtonMap().put(14, new SelectTypeButton(this, true));
+	}
+
+	public void Update()
+	{
+		getButtonMap().clear();
+		buildPage();
+	}
+
+	public void selectServer(Player player, boolean team)
+	{		
+		if (team)
+		{
+			getPlugin().selectServer(player, _serverGroup.getPrefix());	// TODO: Grab the team-key instead of regular game key
+		}
+		else
+		{
+			getPlugin().selectServer(player, _serverGroup.getPrefix());
+		}
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectTypeButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectTypeButton.java
new file mode 100644
index 000000000..847cb3933
--- /dev/null
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectTypeButton.java
@@ -0,0 +1,28 @@
+package mineplex.hub.server.ui.button;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.shop.item.IButton;
+import mineplex.hub.server.ServerInfo;
+import mineplex.hub.server.ServerManager;
+import mineplex.hub.server.ui.IServerPage;
+import mineplex.hub.server.ui.ServerTypePage;
+
+public class SelectTypeButton implements IButton
+{
+	private ServerTypePage _page;
+	private boolean _teamBased;
+	
+	public SelectTypeButton(ServerTypePage page, boolean teamBased)
+	{
+		_page = page;
+		_teamBased = teamBased;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_page.selectServer(player, _teamBased);
+	}
+}

From a2250ea3434350fa8ee543c22366f8d0d86982c0 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sun, 2 Aug 2015 18:59:13 -0500
Subject: [PATCH 109/113] Fix for blocking logins if redis can't add account
 cache.

---
 .../src/mineplex/core/account/CoreClientManager.java  | 11 ++++++++++-
 .../core/personalServer/PersonalServerManager.java    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index 3e5b7196e..9d11610a5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -301,7 +301,16 @@ public class CoreClientManager extends MiniPlugin
 		System.out.println(client.GetPlayerName() + "'s account id = " + client.getAccountId());
 		
 		if (client.getAccountId() > 0)
-			_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()), 60 * 60 * 6);
+		{
+			try
+			{
+				_accountCacheRepository.addElement(new AccountCache(uuid, client.getAccountId()), 60 * 60 * 6);
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
 		
 		return !_clientLoginLock.containsKey(client.GetPlayerName());
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
index db709fd28..466a26d50 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
@@ -157,7 +157,7 @@ public class PersonalServerManager extends MiniPlugin
 				}
 				
 				final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers, 
-						true, false, false, games, "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU);
+						true, false, false, games, "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", "");
 				
 				getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
 				{

From d9a641fd92fd03af509b3c897e478af0957eae8f Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sun, 2 Aug 2015 18:59:43 -0500
Subject: [PATCH 110/113] Updated ServerManager to read server npc stuff from
 redis. Updated ServerGroup to have NPC name in it.

---
 .../mineplex/hub/server/ServerManager.java    | 96 +++++++------------
 .../mineplex/serverdata/data/ServerGroup.java |  7 +-
 2 files changed, 38 insertions(+), 65 deletions(-)

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index beda010d6..72a5343a2 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -59,6 +59,7 @@ import mineplex.hub.server.ui.LobbyShop;
 import mineplex.hub.server.ui.QuickShop;
 import mineplex.hub.server.ui.ServerCountSorter;
 import mineplex.hub.server.ui.ServerNpcShop;
+import mineplex.serverdata.Region;
 import mineplex.serverdata.data.MinecraftServer;
 import mineplex.serverdata.data.ServerGroup;
 
@@ -114,7 +115,7 @@ public class ServerManager extends MiniPlugin
 		
 		plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, "BungeeCord");
 		
-		LoadServers();
+		loadServers();
 		
 		_quickShop = new QuickShop(this, clientManager, donationManager, "Quick Menu");
 		_lobbyShop = new LobbyShop(this, clientManager, donationManager, "Lobby Menu");
@@ -628,7 +629,7 @@ public class ServerManager extends MiniPlugin
 		}
 	}
 	
-	public void LoadServers()
+	public void loadServers()
 	{
 		_serverInfoMap.clear();
 		_serverUpdate.clear();
@@ -640,82 +641,49 @@ public class ServerManager extends MiniPlugin
 		
 		_serverKeyTagMap.clear();
 
-		FileInputStream fstream = null;
-		BufferedReader br = null;
-		
-		HashSet<String> npcNames = new HashSet<String>();
+		Region region = getPlugin().getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU;
 		
 		try
 		{
-			File npcFile = new File("ServerManager.dat");
-
-			if (npcFile.exists())
+			for (ServerGroup serverGroup : mineplex.serverdata.servers.ServerManager.getServerRepository(region).getServerGroups(null))
 			{
-				fstream = new FileInputStream(npcFile);
-				br = new BufferedReader(new InputStreamReader(fstream));
-				
-				String line = br.readLine();
-				
-				while (line != null)
+				if (!serverGroup.getServerNpcName().isEmpty())
 				{
-					String serverNpcName = line.substring(0, line.indexOf('|')).trim();
-					String[] serverTags = line.substring(line.indexOf('|') + 1, line.indexOf('|', line.indexOf('|') + 1)).trim().split(",");
-					String[] locations = line.substring(line.indexOf('|', line.indexOf('|') + 1) + 1).trim().split(",");
+					if (!HasServerNpc(serverGroup.getServerNpcName()))
+					{
+						AddServerNpc(serverGroup.getServerNpcName(), serverGroup.getPrefix());
+					}
+				}
 
-					for (String location : locations)
+				if (!serverGroup.getPortalBottomCornerLocation().isEmpty() && !serverGroup.getPortalTopCornerLocation().isEmpty())
+				{
+					Vector bottomVector = ParseVector(serverGroup.getPortalBottomCornerLocation());
+					Vector topVector = ParseVector(serverGroup.getPortalTopCornerLocation());
+					int blocks = 0;
+					
+					while (blocks < 10 && (bottomVector.getBlockX() != topVector.getBlockX() || bottomVector.getBlockZ() != topVector.getBlockZ()))
 					{
-						_serverPortalLocations.put(ParseVector(location), serverNpcName);
+						_serverPortalLocations.put(new Vector(bottomVector.getBlockX(), bottomVector.getBlockY(), bottomVector.getBlockZ()), serverGroup.getServerNpcName());
+						
+						if (bottomVector.getBlockX() != topVector.getBlockX())
+						{
+							bottomVector.add(new Vector(-(bottomVector.getBlockX() - topVector.getBlockX()) / Math.abs(bottomVector.getBlockX() - topVector.getBlockX()), 0, 0));
+						}
+						else if (bottomVector.getBlockZ() != topVector.getBlockZ())
+						{
+							bottomVector.add(new Vector(0, 0, -(bottomVector.getBlockZ() - topVector.getBlockZ()) / Math.abs(bottomVector.getBlockZ() - topVector.getBlockZ())));
+						}
+						
+						blocks++;
 					}
 					
-					if (!HasServerNpc(serverNpcName))
-					{
-						AddServerNpc(serverNpcName, serverTags);
-					}
-					
-					npcNames.add(serverNpcName);
-					
-					line = br.readLine();
+					_serverPortalLocations.put(bottomVector, serverGroup.getServerNpcName());
 				}
 			}
 		}
 		catch (Exception e)
 		{
-			System.out.println("ServerManager - Error parsing servers file : " + e.getMessage());
-		}
-		finally
-		{
-			if (br != null)
-			{
-				try
-				{
-					br.close();
-				} 
-				catch (IOException e)
-				{
-					e.printStackTrace();
-				}
-			}
-			
-			if (fstream != null)
-			{
-				try
-				{
-					fstream.close();
-				} 
-				catch (IOException e)
-				{
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		for (String npcName : npcNames)
-		{
-			if (!_serverNpcShopMap.containsKey(npcName))
-				_serverNpcShopMap.remove(npcName);
-			
-			if (!_serverKeyInfoMap.containsKey(npcName))
-				_serverKeyInfoMap.remove(npcName);
+			System.out.println("ServerManager - Error parsing servergroups : " + e.getMessage());
 		}
 	}
 
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
index b018383b7..02628419d 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
@@ -57,6 +57,7 @@ public class ServerGroup
 	private boolean _staffOnly;
 	private String _resourcePack = "";
 	
+	private String _npcName = "";
 	private String _portalBottomCornerLocation = "";
 	private String _portalTopCornerLocation = "";
 	
@@ -109,6 +110,7 @@ public class ServerGroup
 		_teamServerKey = data.containsKey("teamServerKey") ? data.get("teamServerKey") : "";
 		_portalBottomCornerLocation = data.containsKey("portalBottomCornerLocation") ? data.get("portalBottomCornerLocation") : "";
 		_portalTopCornerLocation = data.containsKey("portalTopCornerLocation") ? data.get("portalTopCornerLocation") : "";
+		_npcName = data.containsKey("npcName") ? data.get("npcName") : "";
 		
 		if (serverStatuses != null)
 			parseServers(serverStatuses);
@@ -118,7 +120,7 @@ public class ServerGroup
 			, int minPlayers, int maxPlayers, boolean pvp, boolean tournament, boolean tournamentPoints, String games, String serverType, boolean noCheat, boolean worldEdit, boolean teamRejoin
 			, boolean teamAutoJoin, boolean teamForceBalance, boolean gameAutoStart, boolean gameTimeout, boolean rewardGems, boolean rewardItems, boolean rewardStats
 			, boolean rewardAchievements, boolean hotbarInventory, boolean hotbarHubClock, boolean playerKickIdle, boolean staffOnly, boolean whitelist, String resourcePack, Region region
-			, String teamServerKey, String portalBottomCornerLocation, String portalTopCornerLocation)
+			, String teamServerKey, String portalBottomCornerLocation, String portalTopCornerLocation, String npcName)
 	{
 		_name = name;
 		_prefix = prefix;
@@ -160,6 +162,7 @@ public class ServerGroup
 		_teamServerKey = teamServerKey;
 		_portalBottomCornerLocation = portalBottomCornerLocation;
 		_portalTopCornerLocation = portalTopCornerLocation;
+		_npcName = npcName;
 	}
 	
 	public String getName() { return _name; }
@@ -210,6 +213,7 @@ public class ServerGroup
 	
 	public String getTeamServerKey() { return _teamServerKey; }
 	
+	public String getServerNpcName() { return _npcName; }
 	public String getPortalBottomCornerLocation() { return _portalBottomCornerLocation; }
 	public String getPortalTopCornerLocation() { return _portalTopCornerLocation; }
 	
@@ -370,6 +374,7 @@ public class ServerGroup
 			_dataMap.put("teamServerKey", _teamServerKey);
 			_dataMap.put("portalBottomCornerLocation", _portalBottomCornerLocation);
 			_dataMap.put("portalTopCornerLocation", _portalTopCornerLocation);
+			_dataMap.put("npcName", _npcName);
 		}
 		
 		return _dataMap;

From 38cc31838712d7958ede7807c18ebae677fcaae8 Mon Sep 17 00:00:00 2001
From: Shaun Bennett <phination@me.com>
Date: Sun, 2 Aug 2015 19:36:24 -0500
Subject: [PATCH 111/113] Update JOOQ, downcast BigInteger to Long in stats for
 now

---
 .../core/stats/SecondaryStatHandler.java      |   7 +-
 .../mineplex/core/stats/StatsRepository.java  |   9 +-
 .../src/mineplex/database/Account.java        |   3 +-
 .../src/mineplex/database/Keys.java           |   4 +
 .../src/mineplex/database/Routines.java       |  13 +
 .../src/mineplex/database/Tables.java         |   5 +
 .../database/routines/Check_vote.java         |  93 +++++
 .../mineplex/database/tables/AccountStat.java |   4 +-
 .../src/mineplex/database/tables/Bonus.java   |  32 +-
 .../mineplex/database/tables/Chatsnap.java    | 129 +++++++
 .../tables/records/AccountStatRecord.java     |  24 +-
 .../database/tables/records/BonusRecord.java  | 258 ++++++++++++-
 .../tables/records/ChatsnapRecord.java        | 359 ++++++++++++++++++
 13 files changed, 908 insertions(+), 32 deletions(-)
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/routines/Check_vote.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Chatsnap.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/ChatsnapRecord.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
index 5901a17e1..eb13e4940 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
@@ -18,6 +18,7 @@ import org.jooq.impl.DSL;
 import mineplex.core.account.ILoginProcessor;
 import mineplex.core.database.DBPool;
 import mineplex.database.Tables;
+import org.jooq.types.ULong;
 
 public class SecondaryStatHandler implements ILoginProcessor
 {
@@ -58,7 +59,7 @@ public class SecondaryStatHandler implements ILoginProcessor
 							.insertInto(Tables.accountStat)
 							.set(Tables.accountStat.accountId, accountId)
 							.set(Tables.accountStat.statId, statId)
-							.set(Tables.accountStat.value, Math.max(oldPlayerStats.getStat(statName), 0L));
+							.set(Tables.accountStat.value, ULong.valueOf(Math.max(oldPlayerStats.getStat(statName), 0L)));
 
 					inserts.add(insert);
 				}
@@ -99,13 +100,13 @@ public class SecondaryStatHandler implements ILoginProcessor
 								.insertInto(Tables.accountStat)
 								.set(Tables.accountStat.accountId, accountId)
 								.set(Tables.accountStat.statId, statId)
-								.set(Tables.accountStat.value, Math.max(oldPlayerStats.getStat(statName), 0L));
+								.set(Tables.accountStat.value, ULong.valueOf(Math.max(oldPlayerStats.getStat(statName), 0L)));
 
 						inserts.add(insert);
 						
 						Update update = context
 								.update(Tables.accountStat)
-								.set(Tables.accountStat.value, Math.max(oldPlayerStats.getStat(statName), 0L))
+								.set(Tables.accountStat.value, ULong.valueOf(Math.max(oldPlayerStats.getStat(statName), 0L)))
 								.where(Tables.accountStat.accountId.eq(accountId))
 								.and(Tables.accountStat.statId.eq(statId));
 	
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
index 683cca93d..e1524436d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
@@ -22,6 +22,7 @@ import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.Update;
 import org.jooq.impl.DSL;
+import org.jooq.types.ULong;
 
 public class StatsRepository extends RepositoryBase
 {
@@ -102,7 +103,7 @@ public class StatsRepository extends RepositoryBase
 							.insertInto(Tables.accountStat)
 							.set(Tables.accountStat.accountId, accountId)
 							.set(Tables.accountStat.statId, statId)
-							.set(Tables.accountStat.value, uploadQueue.get(accountId).get(statId));
+							.set(Tables.accountStat.value, ULong.valueOf(uploadQueue.get(accountId).get(statId)));
 
 					inserts.add(insert);
 				}
@@ -137,7 +138,7 @@ public class StatsRepository extends RepositoryBase
 			context = DSL.using(getConnectionPool(), SQLDialect.MYSQL);
 		}
 
-		Result<Record2<String, Long>> result = context.select(Tables.stats.name, Tables.accountStat.value).from(Tables.accountStat)
+		Result<Record2<String, ULong>> result = context.select(Tables.stats.name, Tables.accountStat.value).from(Tables.accountStat)
 				.join(Tables.stats)
 				.on(Tables.stats.id.eq(Tables.accountStat.statId))
 				.where(Tables.accountStat.accountId.eq(DSL.select(Tables.accounts.id)
@@ -149,9 +150,9 @@ public class StatsRepository extends RepositoryBase
 		if (result.isNotEmpty())
 		{
 			playerStats = new PlayerStats();
-			for (Record2<String, Long> record : result)
+			for (Record2<String, ULong> record : result)
 			{
-				playerStats.addStat(record.value1(), record.value2());
+				playerStats.addStat(record.value1(), record.value2().longValue());
 			}
 		}
 
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Account.java b/Plugins/Mineplex.Database/src/mineplex/database/Account.java
index 9e66bafa8..745edad55 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Account.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Account.java
@@ -16,7 +16,7 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Account extends org.jooq.impl.SchemaImpl implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 625106486;
+	private static final long serialVersionUID = 2034846771;
 
 	/**
 	 * The reference instance of <code>Account</code>
@@ -54,6 +54,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.AccountTransactions.accountTransactions,
 			mineplex.database.tables.ActiveTournaments.activeTournaments,
 			mineplex.database.tables.Bonus.bonus,
+			mineplex.database.tables.Chatsnap.chatsnap,
 			mineplex.database.tables.ClanAlliances.clanAlliances,
 			mineplex.database.tables.ClanEnemies.clanEnemies,
 			mineplex.database.tables.ClanMember.clanMember,
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
index 4eb24c54d..58b66870c 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
@@ -34,6 +34,7 @@ public class Keys {
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = Identities0.IDENTITY_accountTasks;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = Identities0.IDENTITY_accountTransactions;
 	public static final org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = Identities0.IDENTITY_bonus;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> IDENTITY_chatsnap = Identities0.IDENTITY_chatsnap;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = Identities0.IDENTITY_clanAlliances;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = Identities0.IDENTITY_clanEnemies;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = Identities0.IDENTITY_clans;
@@ -83,6 +84,7 @@ public class Keys {
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = UniqueKeys0.KEY_activeTournaments_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = UniqueKeys0.KEY_bonus_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord> KEY_chatsnap_PRIMARY = UniqueKeys0.KEY_chatsnap_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = UniqueKeys0.KEY_clanEnemies_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = UniqueKeys0.KEY_clanEnemies_unique_clanId;
@@ -175,6 +177,7 @@ public class Keys {
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountTasksRecord, java.lang.Integer> IDENTITY_accountTasks = createIdentity(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountTransactionsRecord, java.lang.Integer> IDENTITY_accountTransactions = createIdentity(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.BonusRecord, java.lang.Integer> IDENTITY_bonus = createIdentity(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
+		public static org.jooq.Identity<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> IDENTITY_chatsnap = createIdentity(mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.Chatsnap.chatsnap.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = createIdentity(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClanEnemiesRecord, java.lang.Integer> IDENTITY_clanEnemies = createIdentity(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = createIdentity(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
@@ -222,6 +225,7 @@ public class Keys {
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ActiveTournamentsRecord> KEY_activeTournaments_PRIMARY = createUniqueKey(mineplex.database.tables.ActiveTournaments.activeTournaments, mineplex.database.tables.ActiveTournaments.activeTournaments.name);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.BonusRecord> KEY_bonus_PRIMARY = createUniqueKey(mineplex.database.tables.Bonus.bonus, mineplex.database.tables.Bonus.bonus.accountId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord> KEY_chatsnap_PRIMARY = createUniqueKey(mineplex.database.tables.Chatsnap.chatsnap, mineplex.database.tables.Chatsnap.chatsnap.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = createUniqueKey(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_PRIMARY = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanEnemiesRecord> KEY_clanEnemies_unique_clanId = createUniqueKey(mineplex.database.tables.ClanEnemies.clanEnemies, mineplex.database.tables.ClanEnemies.clanEnemies.clanId);
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
index 21ae7415e..9a5c0f4de 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
@@ -54,6 +54,19 @@ public class Routines {
 		return p;
 	}
 
+	/**
+	 * Call <code>Account.check_vote</code>
+	 */
+	public static mineplex.database.routines.Check_vote callCheckVote(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
+		mineplex.database.routines.Check_vote p = new mineplex.database.routines.Check_vote();
+		p.setAccountId_in(accountId_in);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
+
+		p.execute(configuration);
+		return p;
+	}
+
 	/**
 	 * Call <code>Account.createLeaderboard</code>
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
index 36f9b2e67..6036ed719 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
@@ -91,6 +91,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Bonus bonus = mineplex.database.tables.Bonus.bonus;
 
+	/**
+	 * The table Account.chatsnap
+	 */
+	public static final mineplex.database.tables.Chatsnap chatsnap = mineplex.database.tables.Chatsnap.chatsnap;
+
 	/**
 	 * The table Account.clanAlliances
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_vote.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_vote.java
new file mode 100644
index 000000000..847580a4c
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_vote.java
@@ -0,0 +1,93 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Check_vote extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 2035299030;
+
+	/**
+	 * The parameter <code>Account.check_vote.accountId_in</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_vote.coinsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_vote.gemsChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.check_vote.pass</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> pass = createParameter("pass", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * The parameter <code>Account.check_vote.outTime</code>.
+	 */
+	public static final org.jooq.Parameter<java.sql.Date> outTime = createParameter("outTime", org.jooq.impl.SQLDataType.DATE, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public Check_vote() {
+		super("check_vote", mineplex.database.Account.Account);
+
+		addInParameter(accountId_in);
+		addInParameter(coinsChange);
+		addInParameter(gemsChange);
+		addOutParameter(pass);
+		addOutParameter(outTime);
+	}
+
+	/**
+	 * Set the <code>accountId_in</code> parameter IN value to the routine
+	 */
+	public void setAccountId_in(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_vote.accountId_in, value);
+	}
+
+	/**
+	 * Set the <code>coinsChange</code> parameter IN value to the routine
+	 */
+	public void setCoinsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_vote.coinsChange, value);
+	}
+
+	/**
+	 * Set the <code>gemsChange</code> parameter IN value to the routine
+	 */
+	public void setGemsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_vote.gemsChange, value);
+	}
+
+	/**
+	 * Get the <code>pass</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getPass() {
+		return getValue(pass);
+	}
+
+	/**
+	 * Get the <code>outTime</code> parameter OUT value from the routine
+	 */
+	public java.sql.Date getOutTime() {
+		return getValue(outTime);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
index fead0616c..a73aa75b4 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountStat extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 956897097;
+	private static final long serialVersionUID = 34581219;
 
 	/**
 	 * The reference instance of <code>Account.accountStat</code>
@@ -44,7 +44,7 @@ public class AccountStat extends org.jooq.impl.TableImpl<mineplex.database.table
 	/**
 	 * The column <code>Account.accountStat.value</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Long> value = createField("value", org.jooq.impl.SQLDataType.BIGINT.defaulted(true), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, org.jooq.types.ULong> value = createField("value", org.jooq.impl.SQLDataType.BIGINTUNSIGNED.defaulted(true), this, "");
 
 	/**
 	 * Create a <code>Account.accountStat</code> table reference
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
index a2acbbbb5..93914d875 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -70389593;
+	private static final long serialVersionUID = -524321170;
 
 	/**
 	 * The reference instance of <code>Account.bonus</code>
@@ -46,6 +46,36 @@ public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Date> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.DATE, this, "");
 
+	/**
+	 * The column <code>Account.bonus.votetime</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Date> votetime = createField("votetime", org.jooq.impl.SQLDataType.DATE, this, "");
+
+	/**
+	 * The column <code>Account.bonus.dailyStreak</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.lang.Integer> dailyStreak = createField("dailyStreak", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.bonus.maxDailyStreak</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.lang.Integer> maxDailyStreak = createField("maxDailyStreak", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.bonus.voteStreak</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.lang.Integer> voteStreak = createField("voteStreak", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.bonus.maxVoteStreak</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.lang.Integer> maxVoteStreak = createField("maxVoteStreak", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.bonus.tickets</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.lang.Integer> tickets = createField("tickets", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
 	/**
 	 * Create a <code>Account.bonus</code> table reference
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Chatsnap.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Chatsnap.java
new file mode 100644
index 000000000..044ee5e36
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Chatsnap.java
@@ -0,0 +1,129 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Chatsnap extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ChatsnapRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -176946707;
+
+	/**
+	 * The reference instance of <code>Account.chatsnap</code>
+	 */
+	public static final mineplex.database.tables.Chatsnap chatsnap = new mineplex.database.tables.Chatsnap();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.ChatsnapRecord> getRecordType() {
+		return mineplex.database.tables.records.ChatsnapRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.chatsnap.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.reporterId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> reporterId = createField("reporterId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.reporteeId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> reporteeId = createField("reporteeId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.time</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.sql.Timestamp> time = createField("time", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.status</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.String> status = createField("status", org.jooq.impl.SQLDataType.VARCHAR.length(10).nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.reason</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.String> reason = createField("reason", org.jooq.impl.SQLDataType.CLOB.length(65535).nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.chatsnap.data</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ChatsnapRecord, java.lang.String> data = createField("data", org.jooq.impl.SQLDataType.CLOB.length(16777215).nullable(false), this, "");
+
+	/**
+	 * Create a <code>Account.chatsnap</code> table reference
+	 */
+	public Chatsnap() {
+		this("chatsnap", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.chatsnap</code> table reference
+	 */
+	public Chatsnap(java.lang.String alias) {
+		this(alias, mineplex.database.tables.Chatsnap.chatsnap);
+	}
+
+	private Chatsnap(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ChatsnapRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Chatsnap(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ChatsnapRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.ChatsnapRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_chatsnap;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_chatsnap_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ChatsnapRecord>>asList(mineplex.database.Keys.KEY_chatsnap_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.Chatsnap as(java.lang.String alias) {
+		return new mineplex.database.tables.Chatsnap(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.Chatsnap rename(java.lang.String name) {
+		return new mineplex.database.tables.Chatsnap(name, null);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java
index 83dc0a684..df8d59c6e 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java
@@ -14,9 +14,9 @@ package mineplex.database.tables.records;
 	comments = "This class is generated by jOOQ"
 )
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.Long> {
+public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, org.jooq.types.ULong> {
 
-	private static final long serialVersionUID = 1109290129;
+	private static final long serialVersionUID = -516667486;
 
 	/**
 	 * Setter for <code>Account.accountStat.accountId</code>.
@@ -49,15 +49,15 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	/**
 	 * Setter for <code>Account.accountStat.value</code>.
 	 */
-	public void setValue(java.lang.Long value) {
+	public void setValue(org.jooq.types.ULong value) {
 		setValue(2, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accountStat.value</code>.
 	 */
-	public java.lang.Long getValue() {
-		return (java.lang.Long) getValue(2);
+	public org.jooq.types.ULong getValue() {
+		return (org.jooq.types.ULong) getValue(2);
 	}
 
 	// -------------------------------------------------------------------------
@@ -80,7 +80,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> fieldsRow() {
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, org.jooq.types.ULong> fieldsRow() {
 		return (org.jooq.Row3) super.fieldsRow();
 	}
 
@@ -88,7 +88,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> valuesRow() {
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, org.jooq.types.ULong> valuesRow() {
 		return (org.jooq.Row3) super.valuesRow();
 	}
 
@@ -112,7 +112,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Long> field3() {
+	public org.jooq.Field<org.jooq.types.ULong> field3() {
 		return mineplex.database.tables.AccountStat.accountStat.value;
 	}
 
@@ -136,7 +136,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Long value3() {
+	public org.jooq.types.ULong value3() {
 		return getValue();
 	}
 
@@ -162,7 +162,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountStatRecord value3(java.lang.Long value) {
+	public AccountStatRecord value3(org.jooq.types.ULong value) {
 		setValue(value);
 		return this;
 	}
@@ -171,7 +171,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountStatRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Long value3) {
+	public AccountStatRecord values(java.lang.Integer value1, java.lang.Integer value2, org.jooq.types.ULong value3) {
 		return this;
 	}
 
@@ -189,7 +189,7 @@ public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineple
 	/**
 	 * Create a detached, initialised AccountStatRecord
 	 */
-	public AccountStatRecord(java.lang.Integer accountId, java.lang.Integer statId, java.lang.Long value) {
+	public AccountStatRecord(java.lang.Integer accountId, java.lang.Integer statId, org.jooq.types.ULong value) {
 		super(mineplex.database.tables.AccountStat.accountStat);
 
 		setValue(0, accountId);
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
index be35509b0..ee1c0bb21 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
@@ -14,9 +14,9 @@ package mineplex.database.tables.records;
 	comments = "This class is generated by jOOQ"
 )
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> {
+public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.sql.Timestamp, java.sql.Date, java.sql.Date, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = -64019858;
+	private static final long serialVersionUID = -785434679;
 
 	/**
 	 * Setter for <code>Account.bonus.accountId</code>.
@@ -60,6 +60,90 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return (java.sql.Date) getValue(2);
 	}
 
+	/**
+	 * Setter for <code>Account.bonus.votetime</code>.
+	 */
+	public void setVotetime(java.sql.Date value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.votetime</code>.
+	 */
+	public java.sql.Date getVotetime() {
+		return (java.sql.Date) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.bonus.dailyStreak</code>.
+	 */
+	public void setDailyStreak(java.lang.Integer value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.dailyStreak</code>.
+	 */
+	public java.lang.Integer getDailyStreak() {
+		return (java.lang.Integer) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.bonus.maxDailyStreak</code>.
+	 */
+	public void setMaxDailyStreak(java.lang.Integer value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.maxDailyStreak</code>.
+	 */
+	public java.lang.Integer getMaxDailyStreak() {
+		return (java.lang.Integer) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.bonus.voteStreak</code>.
+	 */
+	public void setVoteStreak(java.lang.Integer value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.voteStreak</code>.
+	 */
+	public java.lang.Integer getVoteStreak() {
+		return (java.lang.Integer) getValue(6);
+	}
+
+	/**
+	 * Setter for <code>Account.bonus.maxVoteStreak</code>.
+	 */
+	public void setMaxVoteStreak(java.lang.Integer value) {
+		setValue(7, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.maxVoteStreak</code>.
+	 */
+	public java.lang.Integer getMaxVoteStreak() {
+		return (java.lang.Integer) getValue(7);
+	}
+
+	/**
+	 * Setter for <code>Account.bonus.tickets</code>.
+	 */
+	public void setTickets(java.lang.Integer value) {
+		setValue(8, value);
+	}
+
+	/**
+	 * Getter for <code>Account.bonus.tickets</code>.
+	 */
+	public java.lang.Integer getTickets() {
+		return (java.lang.Integer) getValue(8);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -73,23 +157,23 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	}
 
 	// -------------------------------------------------------------------------
-	// Record3 type implementation
+	// Record9 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> fieldsRow() {
-		return (org.jooq.Row3) super.fieldsRow();
+	public org.jooq.Row9<java.lang.Integer, java.sql.Timestamp, java.sql.Date, java.sql.Date, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row9) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> valuesRow() {
-		return (org.jooq.Row3) super.valuesRow();
+	public org.jooq.Row9<java.lang.Integer, java.sql.Timestamp, java.sql.Date, java.sql.Date, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row9) super.valuesRow();
 	}
 
 	/**
@@ -116,6 +200,54 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return mineplex.database.tables.Bonus.bonus.ranktime;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.sql.Date> field4() {
+		return mineplex.database.tables.Bonus.bonus.votetime;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field5() {
+		return mineplex.database.tables.Bonus.bonus.dailyStreak;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field6() {
+		return mineplex.database.tables.Bonus.bonus.maxDailyStreak;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field7() {
+		return mineplex.database.tables.Bonus.bonus.voteStreak;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field8() {
+		return mineplex.database.tables.Bonus.bonus.maxVoteStreak;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field9() {
+		return mineplex.database.tables.Bonus.bonus.tickets;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -140,6 +272,54 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return getRanktime();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.sql.Date value4() {
+		return getVotetime();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value5() {
+		return getDailyStreak();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value6() {
+		return getMaxDailyStreak();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value7() {
+		return getVoteStreak();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value8() {
+		return getMaxVoteStreak();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value9() {
+		return getTickets();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -171,7 +351,61 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Date value3) {
+	public BonusRecord value4(java.sql.Date value) {
+		setVotetime(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord value5(java.lang.Integer value) {
+		setDailyStreak(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord value6(java.lang.Integer value) {
+		setMaxDailyStreak(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord value7(java.lang.Integer value) {
+		setVoteStreak(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord value8(java.lang.Integer value) {
+		setMaxVoteStreak(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord value9(java.lang.Integer value) {
+		setTickets(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Date value3, java.sql.Date value4, java.lang.Integer value5, java.lang.Integer value6, java.lang.Integer value7, java.lang.Integer value8, java.lang.Integer value9) {
 		return this;
 	}
 
@@ -189,11 +423,17 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Create a detached, initialised BonusRecord
 	 */
-	public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Date ranktime) {
+	public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Date ranktime, java.sql.Date votetime, java.lang.Integer dailyStreak, java.lang.Integer maxDailyStreak, java.lang.Integer voteStreak, java.lang.Integer maxVoteStreak, java.lang.Integer tickets) {
 		super(mineplex.database.tables.Bonus.bonus);
 
 		setValue(0, accountId);
 		setValue(1, dailytime);
 		setValue(2, ranktime);
+		setValue(3, votetime);
+		setValue(4, dailyStreak);
+		setValue(5, maxDailyStreak);
+		setValue(6, voteStreak);
+		setValue(7, maxVoteStreak);
+		setValue(8, tickets);
 	}
 }
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ChatsnapRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ChatsnapRecord.java
new file mode 100644
index 000000000..56c41949b
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ChatsnapRecord.java
@@ -0,0 +1,359 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables.records;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(
+	value = {
+		"http://www.jooq.org",
+		"jOOQ version:3.5.2"
+	},
+	comments = "This class is generated by jOOQ"
+)
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ChatsnapRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ChatsnapRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record7<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> {
+
+	private static final long serialVersionUID = 2087133341;
+
+	/**
+	 * Setter for <code>Account.chatsnap.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.reporterId</code>.
+	 */
+	public void setReporterId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.reporterId</code>.
+	 */
+	public java.lang.Integer getReporterId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.reporteeId</code>.
+	 */
+	public void setReporteeId(java.lang.Integer value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.reporteeId</code>.
+	 */
+	public java.lang.Integer getReporteeId() {
+		return (java.lang.Integer) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.time</code>.
+	 */
+	public void setTime(java.sql.Timestamp value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.time</code>.
+	 */
+	public java.sql.Timestamp getTime() {
+		return (java.sql.Timestamp) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.status</code>.
+	 */
+	public void setStatus(java.lang.String value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.status</code>.
+	 */
+	public java.lang.String getStatus() {
+		return (java.lang.String) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.reason</code>.
+	 */
+	public void setReason(java.lang.String value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.reason</code>.
+	 */
+	public java.lang.String getReason() {
+		return (java.lang.String) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.chatsnap.data</code>.
+	 */
+	public void setData(java.lang.String value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.chatsnap.data</code>.
+	 */
+	public java.lang.String getData() {
+		return (java.lang.String) getValue(6);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record7 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> fieldsRow() {
+		return (org.jooq.Row7) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> valuesRow() {
+		return (org.jooq.Row7) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.Chatsnap.chatsnap.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.Chatsnap.chatsnap.reporterId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field3() {
+		return mineplex.database.tables.Chatsnap.chatsnap.reporteeId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.sql.Timestamp> field4() {
+		return mineplex.database.tables.Chatsnap.chatsnap.time;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field5() {
+		return mineplex.database.tables.Chatsnap.chatsnap.status;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field6() {
+		return mineplex.database.tables.Chatsnap.chatsnap.reason;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field7() {
+		return mineplex.database.tables.Chatsnap.chatsnap.data;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getReporterId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value3() {
+		return getReporteeId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.sql.Timestamp value4() {
+		return getTime();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value5() {
+		return getStatus();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value6() {
+		return getReason();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value7() {
+		return getData();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value2(java.lang.Integer value) {
+		setReporterId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value3(java.lang.Integer value) {
+		setReporteeId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value4(java.sql.Timestamp value) {
+		setTime(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value5(java.lang.String value) {
+		setStatus(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value6(java.lang.String value) {
+		setReason(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord value7(java.lang.String value) {
+		setData(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ChatsnapRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.sql.Timestamp value4, java.lang.String value5, java.lang.String value6, java.lang.String value7) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached ChatsnapRecord
+	 */
+	public ChatsnapRecord() {
+		super(mineplex.database.tables.Chatsnap.chatsnap);
+	}
+
+	/**
+	 * Create a detached, initialised ChatsnapRecord
+	 */
+	public ChatsnapRecord(java.lang.Integer id, java.lang.Integer reporterId, java.lang.Integer reporteeId, java.sql.Timestamp time, java.lang.String status, java.lang.String reason, java.lang.String data) {
+		super(mineplex.database.tables.Chatsnap.chatsnap);
+
+		setValue(0, id);
+		setValue(1, reporterId);
+		setValue(2, reporteeId);
+		setValue(3, time);
+		setValue(4, status);
+		setValue(5, reason);
+		setValue(6, data);
+	}
+}

From a561bbbf122b5c91d690545bccd0fc56afd6e75a Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sun, 2 Aug 2015 19:41:42 -0500
Subject: [PATCH 112/113] Added hardcode for EVENT/MPS :D

---
 .../Mineplex.Hub/src/mineplex/hub/server/ServerManager.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index 72a5343a2..c48e45b6d 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -685,6 +685,9 @@ public class ServerManager extends MiniPlugin
 		{
 			System.out.println("ServerManager - Error parsing servergroups : " + e.getMessage());
 		}
+		
+		AddServerNpc("Event Servers", "EVENT");
+		AddServerNpc("Mineplex Player Servers", "MPS");
 	}
 
 	public int GetRequiredSlots(Player player, String serverType)

From 944a4a95356edb820ad85f6cfb7455fab74125b2 Mon Sep 17 00:00:00 2001
From: Ty Sayers <tasayers@uwaterloo.ca>
Date: Sun, 2 Aug 2015 21:18:24 -0400
Subject: [PATCH 113/113] Fix accidental double-queueing bug when left clicking
 server NPCs and add two second cooldown before attempting to auto-join
 servers. Fix bug with server groups not properly loading server NPC names
 into shops. Fix bug with server key/name/npc name not being properly
 interchangeable during server selection and auto-joining process.

---
 .../mineplex/hub/server/ServerManager.java    | 89 +++++++++++++------
 .../src/mineplex/hub/server/ui/LobbyShop.java |  3 +-
 .../mineplex/hub/server/ui/ServerNpcShop.java |  4 +-
 .../hub/server/ui/ServerTypePage.java         |  6 +-
 4 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index 526ebd3b5..956d9f8e5 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -10,9 +10,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -72,6 +74,7 @@ public class ServerManager extends MiniPlugin
 	public final int TOP_SERVERS = 3;			// The number of top contending servers for auto-joining games
 	public final int MIN_SLOTS_REQUIRED = 12;	// The number of slots the max server must have for auto-join
 
+	public final long QUEUE_COOLDOWN = 2000;	// Cooldown (in milliseconds) between queueing again for players
 	private CoreClientManager _clientManager;
 	private DonationManager _donationManager;
 	private Portal _portal;
@@ -80,7 +83,8 @@ public class ServerManager extends MiniPlugin
 	private HubManager _hubManager;
 	private StackerManager _stackerManager;
 	private QueueManager _queueManager;
-	
+
+	private NautHashMap<String, Long> _queueCooldowns = new NautHashMap<String, Long>();
 	private NautHashMap<String, HashSet<ServerInfo>> _serverKeyInfoMap = new NautHashMap<String, HashSet<ServerInfo>>();
 	private NautHashMap<String, String> _serverKeyTagMap = new NautHashMap<String, String>();
 	private NautHashMap<String, Integer> _serverPlayerCounts = new NautHashMap<String, Integer>();
@@ -285,18 +289,6 @@ public class ServerManager extends MiniPlugin
 				timeLeft = 0;
 		}
 
-//		if (party != null)
-//		{
-//			if (player.getName().equals(party.GetLeader()))
-//			{
-//				for (Player partyPlayer : party.GetPlayersOnline())
-//				{
-//					if (!partyPlayer.equals(player))
-//						timeLeft = Math.max(timeLeft, getMillisecondsUntilPortal(partyPlayer));
-//				}
-//			}
-//		}
-
 		return timeLeft;
 	}
 	
@@ -310,22 +302,18 @@ public class ServerManager extends MiniPlugin
 		_serverInfoMap.remove(serverName);
 	}
 	
-	public void addServerGroup(String serverKey, String...serverTag)
+	public void addServerGroup(ServerGroup serverGroup)
 	{
-		_serverKeyInfoMap.put(serverKey, new HashSet<ServerInfo>());
+		_serverKeyInfoMap.put(serverGroup.getName(), new HashSet<ServerInfo>());
+		_serverKeyTagMap.put(serverGroup.getPrefix(), serverGroup.getName());
 		
-		for (String tag : serverTag)
-			_serverKeyTagMap.put(tag, serverKey);
+		if (!serverGroup.getServerNpcName().isEmpty())
+			_serverKeyTagMap.put(serverGroup.getServerNpcName(), serverGroup.getName());
 	}
 	
-	public void AddServerNpc(String serverNpcName, String...serverTag)
+	public void AddServerNpc(ServerGroup serverGroup)
 	{
-		addServerGroup(serverNpcName, serverTag);
-		
-		// TODO: Determine whether server group is team based or not
-		boolean teamBased = false;
-		
-		_serverNpcShopMap.put(serverNpcName, new ServerNpcShop(this, _clientManager, _donationManager, null));
+		_serverNpcShopMap.put(serverGroup.getServerNpcName(), new ServerNpcShop(this, _clientManager, _donationManager, serverGroup));
 	}
 	
 	public void RemoveServerNpc(String serverNpcName)
@@ -492,6 +480,8 @@ public class ServerManager extends MiniPlugin
 				});
 			}
 		});
+		
+		updateCooldowns();
 	}
 
 	public void Help(Player caller, String message)
@@ -540,11 +530,47 @@ public class ServerManager extends MiniPlugin
 	 */
 	public void selectServer(Player player, String serverType)
 	{
+		if (isOnCooldown(player))
+		{
+			return;
+		}
+		
 		ServerInfo bestServer = getBestServer(player, serverType);
 
 		if (bestServer != null)
 		{
 			SelectServer(player, bestServer);
+			addCooldown(player);
+		}
+	}
+	
+	private boolean isOnCooldown(Player player)
+	{
+		if (_queueCooldowns.containsKey(player.getName()))
+		{
+			long elapsed = System.currentTimeMillis() - _queueCooldowns.get(player.getName());
+			
+			return elapsed < QUEUE_COOLDOWN;
+		}
+		
+		return false;
+	}
+	
+	private void addCooldown(Player player)
+	{
+		_queueCooldowns.put(player.getName(), System.currentTimeMillis());
+	}
+	
+	private void updateCooldowns()
+	{
+		for (String playerName : _queueCooldowns.keySet())
+		{
+			Player player = Bukkit.getPlayer(playerName);
+			
+			if (player == null || !isOnCooldown(player))
+			{
+				_queueCooldowns.remove(playerName);
+			}
 		}
 	}
 	
@@ -552,10 +578,17 @@ public class ServerManager extends MiniPlugin
 	 * @param serverType - the type of server that should be fetched
 	 * @return the best server that a new player should join according to a {@code serverType} constraint.
 	 */
-	public ServerInfo getBestServer(Player player, String serverType)
+	public ServerInfo getBestServer(Player player, String serverKey)
 	{
-		List<ServerInfo> servers = new ArrayList<ServerInfo>(GetServerList(serverType));
+		if (_serverKeyTagMap.containsKey(serverKey))	// Update key to full-name if a tag pair exists
+		{
+			serverKey = _serverKeyTagMap.get(serverKey);
+		}
 		
+		Collection<ServerInfo> serverList = GetServerList(serverKey);
+		if (serverList == null) return null;
+		
+		List<ServerInfo> servers = new ArrayList<ServerInfo>(serverList);
 		Collections.sort(servers, new ServerCountSorter());
 		servers = fetchOpenServers(player, servers, servers.size());	// Removes all full servers from list
 
@@ -647,11 +680,13 @@ public class ServerManager extends MiniPlugin
 		{
 			for (ServerGroup serverGroup : mineplex.serverdata.servers.ServerManager.getServerRepository(region).getServerGroups(null))
 			{
+				addServerGroup(serverGroup);	// Caches prefix/tag pairing
+				
 				if (!serverGroup.getServerNpcName().isEmpty())
 				{
 					if (!HasServerNpc(serverGroup.getServerNpcName()))
 					{
-						AddServerNpc(serverGroup.getServerNpcName(), serverGroup.getPrefix());
+						AddServerNpc(serverGroup);
 					}
 				}
 
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
index 8cd3347df..dc7f9477e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
@@ -14,7 +14,8 @@ public class LobbyShop extends ShopBase<ServerManager>
 	{
 		super(plugin, clientManager, donationManager, name);
 		
-		plugin.addServerGroup("Lobby", "Lobby");
+		// TODO: Why is this needed? Re-add?
+		//plugin.addServerGroup("Lobby", "Lobby");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
index 5f97c10b6..ba4f5bf4a 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcShop.java
@@ -19,7 +19,7 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 	
 	public ServerNpcShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager, ServerGroup serverGroup)
 	{
-		super(plugin, clientManager, donationManager, serverGroup.getName());
+		super(plugin, clientManager, donationManager, serverGroup.getServerNpcName());
 		
 		_serverGroup = serverGroup;
 	}
@@ -74,7 +74,7 @@ public class ServerNpcShop extends ShopBase<ServerManager>
 	@Override
 	public boolean attemptShopOpen(Player player)
     {
-		if (true)	// TODO: Check to see if _serverGroup's teamKey field is null
+		if (_serverGroup.getTeamServerKey().isEmpty())	// Has no team server key, so auto-join
 		{
 			getPlugin().selectServer(player, getName());
 			return false;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
index 30a6bee83..2b9b4c378 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
@@ -49,7 +49,7 @@ public class ServerTypePage extends ShopPageBase<ServerManager, ServerNpcShop>
 	{
 		String name = _serverGroup.getName();
 		
-		setItem(12, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Solo " + C.cGray + name, new String[]
+		setItem(12, ItemStackFactory.Instance.CreateStack(Material.STICK.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Solo " + C.cGray + name, new String[]
 				{ 
 			ChatColor.RESET + "Solo Mode",
 			ChatColor.RESET + "",
@@ -58,7 +58,7 @@ public class ServerTypePage extends ShopPageBase<ServerManager, ServerNpcShop>
 			ChatColor.RESET + "Teaming in Solo Mode is bannable!",
 				}));
 		
-		setItem(14, ItemStackFactory.Instance.CreateStack(Material.SKULL.getId(), (byte)0, 2, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Team " + C.cGray + name, new String[]
+		setItem(14, ItemStackFactory.Instance.CreateStack(Material.STICK.getId(), (byte)0, 2, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Play Team " + C.cGray + name, new String[]
 				{ 
 					ChatColor.RESET + "Team Mode",
 					ChatColor.RESET + "",
@@ -79,7 +79,7 @@ public class ServerTypePage extends ShopPageBase<ServerManager, ServerNpcShop>
 	{		
 		if (team)
 		{
-			getPlugin().selectServer(player, _serverGroup.getPrefix());	// TODO: Grab the team-key instead of regular game key
+			getPlugin().selectServer(player, _serverGroup.getTeamServerKey());	// TODO: Grab the team-key instead of regular game key
 		}
 		else
 		{