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 01/70] 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 02/70] 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 1b3d7f1c209c467b458e5d74442376fd1e1b6234 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Wed, 8 Jul 2015 23:57:48 -0400
Subject: [PATCH 03/70] Fixed and added things

---
 .../src/mineplex/core/game/GameDisplay.java   |   1 +
 .../src/nautilus/game/arcade/GameType.java    |   4 +-
 .../game/games/lobbers/BombLobbers.java       | 169 ++++++++++++++++++
 .../game/games/lobbers/kits/KitCannoneer.java |  35 ++++
 .../lobbers/kits/perks/PerkCraftman.java      |  49 +++++
 5 files changed, 257 insertions(+), 1 deletion(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.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..c5230d28f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -27,6 +27,7 @@ public enum GameDisplay
 	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
 	HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
 	Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
+	Lobbers("Bomb Lobbers", Material.TNT, (byte) 0, GameCategory.ARCADE, 53),
 	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
 	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
 	MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug
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..b2b8e3d40 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
@@ -26,6 +26,7 @@ import nautilus.game.arcade.game.games.halloween.Halloween;
 import nautilus.game.arcade.game.games.hideseek.HideSeek;
 import nautilus.game.arcade.game.games.holeinwall.HoleInTheWall;
 import nautilus.game.arcade.game.games.horsecharge.Horse;
+import nautilus.game.arcade.game.games.lobbers.BombLobbers;
 import nautilus.game.arcade.game.games.micro.Micro;
 import nautilus.game.arcade.game.games.milkcow.MilkCow;
 import nautilus.game.arcade.game.games.minestrike.MineStrike;
@@ -84,6 +85,7 @@ public enum GameType
 	HideSeek(HideSeek.class, GameDisplay.HideSeek),
 	HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
 	Horse(Horse.class, GameDisplay.Horse),
+	Lobbers(BombLobbers.class, GameDisplay.Lobbers),
 	Micro(Micro.class, GameDisplay.Micro),
 	MilkCow(MilkCow.class, GameDisplay.MilkCow),
 	MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/file/c/assets.zip", true),// Temp set to CHAMPIONS to fix UI bug
@@ -112,7 +114,7 @@ public enum GameType
 	TurfWars(TurfForts.class, GameDisplay.TurfWars),
 	UHC(UHC.class, GameDisplay.UHC),
 	WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
-	Wizards(Wizards.class, GameDisplay.Barbarians.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
+	Wizards(Wizards.class, GameDisplay.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
 	ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
 	
 	Build(Build.class, GameDisplay.Build),
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
new file mode 100644
index 000000000..1a2b6aa02
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java
@@ -0,0 +1,169 @@
+package nautilus.game.arcade.game.games.lobbers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
+import mineplex.core.common.util.NautHashMap;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.common.util.UtilPlayer;
+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.lobbers.kits.KitCannoneer;
+import nautilus.game.arcade.kit.Kit;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public class BombLobbers extends TeamGame
+{
+	private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
+	
+	private NautHashMap<TNTPrimed, String> _throwers = new NautHashMap<TNTPrimed, String>();
+	private NautHashMap<TNTPrimed, GameTeam> _teams = new NautHashMap<TNTPrimed, GameTeam>();
+	
+	private List<Player> _allowed = new ArrayList<Player>();
+	
+	public BombLobbers(ArcadeManager manager)
+	{
+		super(manager, GameType.Lobbers, new Kit[]
+				{
+				new KitCannoneer(manager)
+				}, new String[]
+						{
+				"Throw TNT to blow up your enemies!",
+				"Click with TNT to throw"
+						});
+		
+		DamagePvP = false;
+		DamageSelf = false;
+
+		WorldWaterDamage = 5;
+		
+		PrepareFreeze = false;
+		
+		TeamArmor = true;
+		TeamArmorHotbar = true;
+	}
+	
+	@EventHandler
+	public void loadTeamLocations(GameStateChangeEvent event)
+	{
+		if (event.GetState() == GameState.Live)
+		{
+			for (GameTeam team : _teamList)
+			{
+				_averageSpawns.put(team, UtilAlg.getAverageLocation(team.GetSpawns()));
+			}
+		}
+	}
+	
+	//Skywars code
+	@EventHandler
+	public void throwTNT(PlayerInteractEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		Player player = event.getPlayer();
+
+		if (!IsAlive(player))
+			return;
+
+		if (!UtilInv.IsItem(player.getItemInHand(), Material.TNT, (byte) 0))
+			return;
+		
+		event.setCancelled(true);
+
+		UtilInv.remove(player, Material.TNT, (byte) 0, 1);
+		UtilInv.Update(player);
+
+		TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()),TNTPrimed.class);
+
+		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
+		
+		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
+
+		_throwers.put(tnt, player.getName());
+		_teams.put(tnt, GetTeam(player));
+	}
+
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onTNTExplode(ExplosionPrimeEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (!(event.getEntity() instanceof TNTPrimed))
+			return;
+
+		TNTPrimed tnt = (TNTPrimed) event.getEntity();
+				
+		if (!_throwers.containsKey(tnt))
+			return;
+
+		Player thrower = UtilPlayer.searchExact(_throwers.get(tnt));
+				
+		if (thrower == null)
+		{
+			if (_teams.get(tnt).IsTeamAlive())
+			{
+				thrower = _teams.get(tnt).GetPlayers(true).get(0);
+			}
+			else
+			{
+				event.setCancelled(true);
+
+				event.getEntity().remove();
+				return;
+			}
+		}
+				
+		GameTeam throwerTeam = GetTeam(thrower);
+		GameTeam throwerSide = getSide(tnt.getLocation());
+		
+		if (throwerTeam.GetName().equalsIgnoreCase(throwerSide.GetName()))
+		{
+			event.setCancelled(true);
+
+			event.getEntity().remove();
+			return;
+		}
+		
+		_allowed.add(thrower);
+		_throwers.remove(tnt);
+		_teams.remove(tnt);
+		
+		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 8))
+		{
+			if (Manager.canHurt(thrower, other))
+			{
+				Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
+			}
+		}
+	}
+
+	private GameTeam getSide(Location entityLoc)
+	{		
+		Location nearest = UtilAlg.findClosest(entityLoc, new ArrayList<Location>(_averageSpawns.values()));
+		for (Entry<GameTeam, Location> entry : _averageSpawns.entrySet())
+		{
+			if (entry.getValue().equals(nearest))
+				return entry.getKey();
+		}
+		return null;
+	}
+	
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java
new file mode 100644
index 000000000..892a06285
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java
@@ -0,0 +1,35 @@
+package nautilus.game.arcade.game.games.lobbers.kits;
+
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+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 org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+public class KitCannoneer extends Kit
+{
+
+	public KitCannoneer(ArcadeManager manager)
+	{
+		super(manager, "Cannoneer", KitAvailability.Free, 0, new String[]
+				{
+				"Once the ammunitions expert for",
+				"pirates, explosives are his specialty."
+				}, new Perk[]
+						{
+				new PerkCraftman()
+						}, EntityType.ZOMBIE, new ItemBuilder(Material.TNT).build());
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
new file mode 100644
index 000000000..b6d74ff5b
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -0,0 +1,49 @@
+package nautilus.game.arcade.game.games.lobbers.kits.perks;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class PerkCraftman extends Perk
+{
+	private Recharge _recharge;
+	
+	public PerkCraftman()
+	{
+		super("Craftman", new String[]
+				{
+				C.cGray + "Recieve 1 TNT every 2 seconds. Maximum of 4."
+				});
+		
+		_recharge = Recharge.Instance;
+	}
+	
+	@EventHandler
+	public void give(UpdateEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!_recharge.usable(player, "TNT Give"))
+				continue;
+			
+			_recharge.use(player, "TNT Give", 2000, false, false);
+			
+			//Has 4
+			if (UtilInv.contains(player, Material.TNT, (byte) 0, 4))
+				continue;
+			
+			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(C.cGreen + "Throwing TNT").build());
+		}
+	}
+
+}

From 9e07be51c7fdb49512dc0ec6e6f98848ad512650 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 9 Jul 2015 12:03:56 -0400
Subject: [PATCH 04/70] Bug fixes

---
 .../game/games/lobbers/BombLobbers.java       | 113 +++++++++++++++++-
 .../{KitCannoneer.java => KitJumper.java}     |  13 +-
 .../lobbers/kits/perks/PerkCraftman.java      |  16 ++-
 3 files changed, 132 insertions(+), 10 deletions(-)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/{KitCannoneer.java => KitJumper.java} (66%)

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 1a2b6aa02..abb1e9fb6 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
@@ -1,29 +1,42 @@
 package nautilus.game.arcade.game.games.lobbers;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
+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.UtilInv;
+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.explosion.ExplosionEvent;
+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.TeamGame;
-import nautilus.game.arcade.game.games.lobbers.kits.KitCannoneer;
+import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
 import nautilus.game.arcade.kit.Kit;
 
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 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.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
@@ -40,7 +53,7 @@ public class BombLobbers extends TeamGame
 	{
 		super(manager, GameType.Lobbers, new Kit[]
 				{
-				new KitCannoneer(manager)
+				new KitJumper(manager)
 				}, new String[]
 						{
 				"Throw TNT to blow up your enemies!",
@@ -56,6 +69,11 @@ public class BombLobbers extends TeamGame
 		
 		TeamArmor = true;
 		TeamArmorHotbar = true;
+		
+		InventoryOpenChest = false;
+		InventoryOpenBlock = false;
+		
+		HungerSet = 20;
 	}
 	
 	@EventHandler
@@ -70,10 +88,12 @@ public class BombLobbers extends TeamGame
 		}
 	}
 	
-	//Skywars code
 	@EventHandler
 	public void throwTNT(PlayerInteractEvent event)
 	{
+		if (event.getAction() == Action.PHYSICAL)
+			return;
+		
 		if (!IsLive())
 			return;
 
@@ -154,7 +174,94 @@ public class BombLobbers extends TeamGame
 			}
 		}
 	}
+	
+	//Doesn't seem to work for some reason
+	@EventHandler
+	public void removeLiquids(EntityExplodeEvent event)
+	{
+		System.out.println("EXPLOSION EVENT CALLED FROM ENTITYEXPLODEEVENT");
+		if (!IsLive())
+			return;
+		
+		Iterator<Block> iterator = event.blockList().iterator();
+		
+		while (iterator.hasNext())
+		{
+			if (iterator.next().isLiquid())
+			{
+				System.out.println("REMOVED A LIQUID FROM THE EXPLOSION");
 
+				iterator.remove();
+			}
+		}
+	}
+	
+	@EventHandler
+	public void removeLiquids2(ExplosionEvent event)
+	{
+		System.out.println("EXPLOSION EVENT CALLED FROM EXPLOSIONEVENT");
+		if (!IsLive())
+			return;
+		
+		Iterator<Block> iterator = event.GetBlocks().iterator();
+		
+		while (iterator.hasNext())
+		{
+			if (iterator.next().isLiquid())
+			{
+				System.out.println("REMOVED A LIQUID FROM THE EXPLOSION");
+
+				iterator.remove();
+			}
+		}
+	}
+
+	@EventHandler
+	public void updateParticles(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!IsLive())
+			return;
+		
+		for (Entry<TNTPrimed, GameTeam> tnt : _teams.entrySet())
+		{
+			if (tnt.getKey() != null && tnt.getKey().isValid() && !tnt.getKey().isOnGround())
+			{
+				if (tnt.getValue().GetColor() == ChatColor.AQUA)
+				{
+					UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), -1, -1, 1, 1, 0,
+							ViewDist.LONG, UtilServer.getPlayers());
+					}
+				else
+				{
+					UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), 0.0F, 0.0F, 0.0F, 0.0F, 3,  ViewDist.LONG, UtilServer.getPlayers());
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void preventCheating(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!IsLive())
+			return;
+		
+		for (Player player : GetPlayers(true))
+		{
+			if (GetTeam(player) != getSide(player.getLocation()))
+			{
+				player.damage(500);
+				UtilPlayer.message(player, F.main("Game", "You were killed for trying to cheat!"));
+				continue;
+			}
+		}
+	}
+	
 	private GameTeam getSide(Location entityLoc)
 	{		
 		Location nearest = UtilAlg.findClosest(entityLoc, new ArrayList<Location>(_averageSpawns.values()));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
similarity index 66%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
index 892a06285..ad38caeb1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitCannoneer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java
@@ -6,22 +6,23 @@ 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.PerkDoubleJump;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-public class KitCannoneer extends Kit
+public class KitJumper extends Kit
 {
 
-	public KitCannoneer(ArcadeManager manager)
+	public KitJumper(ArcadeManager manager)
 	{
-		super(manager, "Cannoneer", KitAvailability.Free, 0, new String[]
+		super(manager, "Jumper", KitAvailability.Free, 0, new String[]
 				{
-				"Once the ammunitions expert for",
-				"pirates, explosives are his specialty."
+				"Use your jumping abilities to leap away from trouble!"
 				}, new Perk[]
 						{
+				new PerkDoubleJump("Double Jump", 1.2, 1.2, false, 6000, true),
 				new PerkCraftman()
 						}, EntityType.ZOMBIE, new ItemBuilder(Material.TNT).build());
 	}
@@ -32,4 +33,4 @@ public class KitCannoneer extends Kit
 		
 	}
 
-}
+}
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index b6d74ff5b..26b0b6e28 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -36,7 +36,7 @@ public class PerkCraftman extends Perk
 			if (!_recharge.usable(player, "TNT Give"))
 				continue;
 			
-			_recharge.use(player, "TNT Give", 2000, false, false);
+			_recharge.use(player, "TNT Give", rechargeSeconds(), false, false);
 			
 			//Has 4
 			if (UtilInv.contains(player, Material.TNT, (byte) 0, 4))
@@ -45,5 +45,19 @@ public class PerkCraftman extends Perk
 			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(C.cGreen + "Throwing TNT").build());
 		}
 	}
+	
+	public long rechargeSeconds()
+	{
+		if (!Manager.GetGame().IsLive())
+			return 0;
+		
+		if (Manager.GetGame().getGameLiveTime() > 60000)
+			return 2000;
+		
+		if (Manager.GetGame().getGameLiveTime() > 30000)
+			return 3000;
+		
+		return 4000;
+	}
 
 }

From f812fd0530fc3f5c0729c8e3060c72ea08c39589 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Fri, 10 Jul 2015 16:31:37 -0400
Subject: [PATCH 05/70] Please push please

---
 .../game/games/lobbers/BombLobbers.java       | 100 +++++---------
 .../games/lobbers/events/TNTThrowEvent.java   |  37 ++++++
 .../game/games/lobbers/kits/KitDetonator.java | 124 ++++++++++++++++++
 .../game/games/lobbers/kits/KitJumper.java    |   2 +-
 .../lobbers/kits/perks/PerkCraftman.java      |  28 ++--
 5 files changed, 202 insertions(+), 89 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTThrowEvent.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.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 abb1e9fb6..026ac13a3 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
@@ -1,8 +1,6 @@
 package nautilus.game.arcade.game.games.lobbers;
 
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map.Entry;
 
 import mineplex.core.common.util.F;
@@ -15,7 +13,6 @@ 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.explosion.ExplosionEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
@@ -23,6 +20,8 @@ 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.lobbers.events.TNTThrowEvent;
+import nautilus.game.arcade.game.games.lobbers.kits.KitDetonator;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
 import nautilus.game.arcade.kit.Kit;
 
@@ -30,15 +29,13 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 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.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.metadata.FixedMetadataValue;
 
 public class BombLobbers extends TeamGame
 {
@@ -46,14 +43,13 @@ public class BombLobbers extends TeamGame
 	
 	private NautHashMap<TNTPrimed, String> _throwers = new NautHashMap<TNTPrimed, String>();
 	private NautHashMap<TNTPrimed, GameTeam> _teams = new NautHashMap<TNTPrimed, GameTeam>();
-	
-	private List<Player> _allowed = new ArrayList<Player>();
-	
+		
 	public BombLobbers(ArcadeManager manager)
 	{
 		super(manager, GameType.Lobbers, new Kit[]
 				{
-				new KitJumper(manager)
+				new KitJumper(manager),
+				new KitDetonator(manager)
 				}, new String[]
 						{
 				"Throw TNT to blow up your enemies!",
@@ -73,6 +69,12 @@ public class BombLobbers extends TeamGame
 		InventoryOpenChest = false;
 		InventoryOpenBlock = false;
 		
+		ItemDrop = false;
+		
+		BlockPlace = false;
+		
+		Manager.GetExplosion().SetLiquidDamage(false);
+		
 		HungerSet = 20;
 	}
 	
@@ -107,20 +109,25 @@ public class BombLobbers extends TeamGame
 		
 		event.setCancelled(true);
 
+		
 		UtilInv.remove(player, Material.TNT, (byte) 0, 1);
 		UtilInv.Update(player);
 
 		TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()),TNTPrimed.class);
+		tnt.setFuseTicks(60);
+		tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
 
 		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
 		
 		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
-
+		
 		_throwers.put(tnt, player.getName());
 		_teams.put(tnt, GetTeam(player));
+		
+		Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
 	}
 
-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler
 	public void onTNTExplode(ExplosionPrimeEvent event)
 	{
 		if (!IsLive())
@@ -138,17 +145,13 @@ public class BombLobbers extends TeamGame
 				
 		if (thrower == null)
 		{
-			if (_teams.get(tnt).IsTeamAlive())
-			{
-				thrower = _teams.get(tnt).GetPlayers(true).get(0);
-			}
-			else
-			{
-				event.setCancelled(true);
+			event.setCancelled(true);
 
-				event.getEntity().remove();
-				return;
-			}
+			_throwers.remove(tnt);
+			_teams.remove(tnt);
+
+			event.getEntity().remove();
+			return;
 		}
 				
 		GameTeam throwerTeam = GetTeam(thrower);
@@ -158,61 +161,20 @@ public class BombLobbers extends TeamGame
 		{
 			event.setCancelled(true);
 
+			_throwers.remove(tnt);
+			_teams.remove(tnt);
+			
 			event.getEntity().remove();
+			
 			return;
 		}
 		
-		_allowed.add(thrower);
 		_throwers.remove(tnt);
 		_teams.remove(tnt);
 		
-		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 8))
+		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
 		{
-			if (Manager.canHurt(thrower, other))
-			{
-				Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
-			}
-		}
-	}
-	
-	//Doesn't seem to work for some reason
-	@EventHandler
-	public void removeLiquids(EntityExplodeEvent event)
-	{
-		System.out.println("EXPLOSION EVENT CALLED FROM ENTITYEXPLODEEVENT");
-		if (!IsLive())
-			return;
-		
-		Iterator<Block> iterator = event.blockList().iterator();
-		
-		while (iterator.hasNext())
-		{
-			if (iterator.next().isLiquid())
-			{
-				System.out.println("REMOVED A LIQUID FROM THE EXPLOSION");
-
-				iterator.remove();
-			}
-		}
-	}
-	
-	@EventHandler
-	public void removeLiquids2(ExplosionEvent event)
-	{
-		System.out.println("EXPLOSION EVENT CALLED FROM EXPLOSIONEVENT");
-		if (!IsLive())
-			return;
-		
-		Iterator<Block> iterator = event.GetBlocks().iterator();
-		
-		while (iterator.hasNext())
-		{
-			if (iterator.next().isLiquid())
-			{
-				System.out.println("REMOVED A LIQUID FROM THE EXPLOSION");
-
-				iterator.remove();
-			}
+			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
 		}
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTThrowEvent.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTThrowEvent.java
new file mode 100644
index 000000000..b6bebee11
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTThrowEvent.java
@@ -0,0 +1,37 @@
+package nautilus.game.arcade.game.games.lobbers.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+public class TNTThrowEvent extends PlayerEvent
+{
+	private static final HandlerList _handlers = new HandlerList();
+
+	private TNTPrimed _tnt;
+		
+	public TNTThrowEvent(Player thrower, TNTPrimed tnt)
+	{
+		super(thrower);
+		
+		_tnt = tnt;
+	}
+	
+	public TNTPrimed getTNT()
+	{
+		return _tnt;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return _handlers;
+	}
+	
+	@Override
+	public HandlerList getHandlers()
+	{
+		return getHandlerList();
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
new file mode 100644
index 000000000..9cde3f12f
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -0,0 +1,124 @@
+package nautilus.game.arcade.game.games.lobbers.kits;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
+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 org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class KitDetonator extends Kit
+{
+
+	public KitDetonator(ArcadeManager manager)
+	{
+		super(manager, "Detonator", KitAvailability.Free, 0, new String[]
+				{
+				"He doesn't like to wait.",
+				"",
+				C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Fuse Time.",
+				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time."
+				}, new Perk[]
+						{
+				new PerkCraftman()
+						}, EntityType.ZOMBIE,
+				new ItemBuilder(Material.LEVER).build());
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).setAmount(2).build());
+	}
+
+	@EventHandler
+	public void setFuse(TNTThrowEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		if (!HasKit(event.getPlayer()))
+			return;
+		
+		ItemStack lever = event.getPlayer().getInventory().getItem(1);
+		
+		if (lever == null || lever.getType() == Material.AIR)
+		{
+			GiveItems(event.getPlayer());
+		}
+		else
+		{
+			if (lever.getAmount() <= 0 || lever.getAmount() > 3)
+			{
+				GiveItems(event.getPlayer());
+			}
+			else
+			{
+				event.getTNT().setFuseTicks(lever.getAmount() * 20);
+			}
+		}		
+	}
+	
+	@EventHandler
+	public void changeFuse(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.PHYSICAL)
+			return;
+		
+		if (!Manager.GetGame().IsLive())
+			return;
+
+		if (!Manager.IsAlive(event.getPlayer()))
+			return;
+
+		if (!HasKit(event.getPlayer()))
+			return;
+		
+		if (event.getItem().getType() != Material.LEVER)
+			return;
+		
+		ItemStack lever = event.getPlayer().getInventory().getItem(1);
+		
+		if (lever.getAmount() <= 0 || lever.getAmount() > 3)
+		{
+			GiveItems(event.getPlayer());
+			return;
+		}
+		
+		//Right
+		if (event.getAction().toString().contains("RIGHT"))
+		{
+			if (lever.getAmount() == 3)
+			{
+				return;
+			}
+			lever.setAmount(lever.getAmount() + 1);
+			UtilInv.Update(event.getPlayer());
+		}
+		//Left
+		else
+		{
+			if (lever.getAmount() == 1)
+			{
+				return;
+			}
+			lever.setAmount(lever.getAmount() - 1);
+			UtilInv.Update(event.getPlayer());
+		}
+		
+		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.CLICK, 3.0F, 1.0F);
+	}	
+}
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 ad38caeb1..4b97e2985 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
@@ -24,7 +24,7 @@ public class KitJumper extends Kit
 						{
 				new PerkDoubleJump("Double Jump", 1.2, 1.2, false, 6000, true),
 				new PerkCraftman()
-						}, EntityType.ZOMBIE, new ItemBuilder(Material.TNT).build());
+						}, EntityType.ZOMBIE, new ItemBuilder(Material.IRON_AXE).build());
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index 26b0b6e28..b99b833ae 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -1,6 +1,7 @@
 package nautilus.game.arcade.game.games.lobbers.kits.perks;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
 import mineplex.core.recharge.Recharge;
@@ -8,6 +9,7 @@ import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.kit.Perk;
 
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -19,7 +21,7 @@ public class PerkCraftman extends Perk
 	{
 		super("Craftman", new String[]
 				{
-				C.cGray + "Recieve 1 TNT every 2 seconds. Maximum of 4."
+				C.cGray + "Recieve 1 TNT every 2 seconds. Maximum of 3."
 				});
 		
 		_recharge = Recharge.Instance;
@@ -35,29 +37,17 @@ public class PerkCraftman extends Perk
 		{
 			if (!_recharge.usable(player, "TNT Give"))
 				continue;
-			
-			_recharge.use(player, "TNT Give", rechargeSeconds(), false, false);
+
+			_recharge.use(player, "TNT Give", Manager.GetGame().getGameLiveTime() >= 60000 ? 3000 : (Manager.GetGame().getGameLiveTime() >= 3000 ? 4000 : 5000), false, false);
 			
 			//Has 4
-			if (UtilInv.contains(player, Material.TNT, (byte) 0, 4))
+			if (UtilInv.contains(player, Material.TNT, (byte) 0, 3))
 				continue;
 			
-			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(C.cGreen + "Throwing TNT").build());
+			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(F.item("Throwing TNT")).build());
+
+			player.getWorld().playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 3.0F, 1.0F);
 		}
 	}
-	
-	public long rechargeSeconds()
-	{
-		if (!Manager.GetGame().IsLive())
-			return 0;
-		
-		if (Manager.GetGame().getGameLiveTime() > 60000)
-			return 2000;
-		
-		if (Manager.GetGame().getGameLiveTime() > 30000)
-			return 3000;
-		
-		return 4000;
-	}
 
 }

From d0180910e9953b5ee647d0baccbf443c22d33527 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 11 Jul 2015 10:25:04 -0400
Subject: [PATCH 06/70] Added two new kits.

---
 .../game/games/lobbers/BombLobbers.java       |  16 +-
 .../game/games/lobbers/kits/KitArmorer.java   |  53 ++++++
 .../game/games/lobbers/kits/KitDetonator.java |  44 +++--
 .../game/games/lobbers/kits/KitJumper.java    |   9 +-
 .../game/games/lobbers/kits/KitWaller.java    |  37 ++++
 .../games/lobbers/kits/perks/PerkWaller.java  | 162 ++++++++++++++++++
 6 files changed, 289 insertions(+), 32 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.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 026ac13a3..cbdc955e4 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
@@ -21,8 +21,10 @@ import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.TeamGame;
 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.KitDetonator;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
+import nautilus.game.arcade.game.games.lobbers.kits.KitWaller;
 import nautilus.game.arcade.kit.Kit;
 
 import org.bukkit.ChatColor;
@@ -49,14 +51,15 @@ public class BombLobbers extends TeamGame
 		super(manager, GameType.Lobbers, new Kit[]
 				{
 				new KitJumper(manager),
-				new KitDetonator(manager)
+				new KitArmorer(manager),
+				new KitDetonator(manager),
+				new KitWaller(manager)
 				}, new String[]
 						{
 				"Throw TNT to blow up your enemies!",
 				"Click with TNT to throw"
 						});
 		
-		DamagePvP = false;
 		DamageSelf = false;
 
 		WorldWaterDamage = 5;
@@ -73,6 +76,8 @@ public class BombLobbers extends TeamGame
 		
 		BlockPlace = false;
 		
+		DamageFall = true;
+		
 		Manager.GetExplosion().SetLiquidDamage(false);
 		
 		HungerSet = 20;
@@ -153,11 +158,8 @@ public class BombLobbers extends TeamGame
 			event.getEntity().remove();
 			return;
 		}
-				
-		GameTeam throwerTeam = GetTeam(thrower);
-		GameTeam throwerSide = getSide(tnt.getLocation());
 		
-		if (throwerTeam.GetName().equalsIgnoreCase(throwerSide.GetName()))
+		if (GetTeam(thrower) == getSide(tnt.getLocation()))
 		{
 			event.setCancelled(true);
 
@@ -172,7 +174,7 @@ public class BombLobbers extends TeamGame
 		_throwers.remove(tnt);
 		_teams.remove(tnt);
 		
-		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
+		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 5))
 		{
 			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
 		}
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
new file mode 100644
index 000000000..de1651826
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java
@@ -0,0 +1,53 @@
+package nautilus.game.arcade.game.games.lobbers.kits;
+
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+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 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
+{
+
+	public KitArmorer(ArcadeManager manager)
+	{
+		super(manager, "Armorer", KitAvailability.Free, 0, new String[]
+				{
+				"He uses his expert armor-making",
+				"skills to block excess damage!",
+				"",
+				C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
+				}, new Perk[]
+						{
+				new PerkCraftman()
+						}, EntityType.ZOMBIE,
+				new ItemStack(Material.AIR));
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setHelmet(new ItemBuilder(Material.GOLD_HELMET).setUnbreakable(true).build());
+		player.getInventory().setChestplate(new ItemBuilder(Material.GOLD_CHESTPLATE).setUnbreakable(true).build());
+		player.getInventory().setLeggings(new ItemBuilder(Material.GOLD_LEGGINGS).setUnbreakable(true).build());
+		player.getInventory().setBoots(new ItemBuilder(Material.GOLD_BOOTS).setUnbreakable(true).build());
+	}
+	
+	@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());
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index 9cde3f12f..6c8c3768f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -2,6 +2,8 @@ package nautilus.game.arcade.game.games.lobbers.kits;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
 import nautilus.game.arcade.ArcadeManager;
@@ -14,9 +16,9 @@ import nautilus.game.arcade.kit.Perk;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
@@ -37,12 +39,18 @@ public class KitDetonator extends Kit
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.LEVER).build());
 	}
-
+	
 	@Override
 	public void GiveItems(Player player)
 	{
 		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).setAmount(2).build());
 	}
+	
+	@Override
+	public void SpawnCustom(LivingEntity ent)
+	{
+
+	}
 
 	@EventHandler
 	public void setFuse(TNTThrowEvent event)
@@ -75,9 +83,6 @@ public class KitDetonator extends Kit
 	@EventHandler
 	public void changeFuse(PlayerInteractEvent event)
 	{
-		if (event.getAction() == Action.PHYSICAL)
-			return;
-		
 		if (!Manager.GetGame().IsLive())
 			return;
 
@@ -87,38 +92,29 @@ public class KitDetonator extends Kit
 		if (!HasKit(event.getPlayer()))
 			return;
 		
-		if (event.getItem().getType() != Material.LEVER)
+		if (!UtilInv.IsItem(event.getItem(), Material.LEVER, (byte) 0))
 			return;
 		
-		ItemStack lever = event.getPlayer().getInventory().getItem(1);
-		
-		if (lever.getAmount() <= 0 || lever.getAmount() > 3)
-		{
-			GiveItems(event.getPlayer());
-			return;
-		}
+		int amount = event.getPlayer().getInventory().getItem(1).getAmount();
 		
 		//Right
-		if (event.getAction().toString().contains("RIGHT"))
+		if (UtilEvent.isAction(event, ActionType.R))
 		{
-			if (lever.getAmount() == 3)
-			{
+			if (amount >= 3)
 				return;
-			}
-			lever.setAmount(lever.getAmount() + 1);
+			
+			UtilInv.insert(event.getPlayer(), new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).build());
 			UtilInv.Update(event.getPlayer());
 		}
 		//Left
-		else
+		else if (UtilEvent.isAction(event, ActionType.L))
 		{
-			if (lever.getAmount() == 1)
-			{
+			if (amount <= 1)
 				return;
-			}
-			lever.setAmount(lever.getAmount() - 1);
+			
+			UtilInv.remove(event.getPlayer(), Material.LEVER, (byte) 0, 1);
 			UtilInv.Update(event.getPlayer());
 		}
-		
 		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.CLICK, 3.0F, 1.0F);
 	}	
 }
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 4b97e2985..20e73f9cd 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
@@ -10,6 +10,7 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump;
 
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 public class KitJumper extends Kit
@@ -30,7 +31,13 @@ public class KitJumper extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		
+
+	}
+	
+	@Override
+	public void SpawnCustom(LivingEntity ent)
+	{
+
 	}
 
 }
\ No newline at end of file
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
new file mode 100644
index 000000000..b427930a1
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java
@@ -0,0 +1,37 @@
+package nautilus.game.arcade.game.games.lobbers.kits;
+
+import mineplex.core.common.util.F;
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkWaller;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+public class KitWaller extends Kit
+{
+
+	public KitWaller(ArcadeManager manager)
+	{
+		super(manager, "Waller", KitAvailability.Free, 0, new String[]
+				{
+				"When the times get tough,",
+				"build yourself a wall!"
+				}, new Perk[]
+						{
+				new PerkWaller()
+						}, EntityType.ZOMBIE,
+				new ItemBuilder(Material.SMOOTH_BRICK).setUnbreakable(true).build());
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		player.getInventory().setItem(1, new ItemBuilder(Material.STONE_SPADE).setAmount(3).setTitle(F.item("Wall Builder")).build());
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
new file mode 100644
index 000000000..187ab2a49
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -0,0 +1,162 @@
+package nautilus.game.arcade.game.games.lobbers.kits.perks;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.explosion.ExplosionEvent;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public class PerkWaller extends Perk
+{
+	private BlockFace[] axis = { BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST };
+
+	private Set<TNTPrimed> _tnt = new HashSet<TNTPrimed>();
+	
+	private Set<Location> _wallBlocks = new HashSet<Location>();
+
+	public PerkWaller()
+	{
+		super("Waller", new String[]
+				{
+				C.cYellow + "Click Block" + C.cGray + " with shovel to " + C.cGreen + "Place Wall",
+				C.cGray + "Walls can absorb 1 hit before breaking.",
+				C.cGray + "TNT that touches a wall will explode instantly."
+				});
+	}
+	
+	@EventHandler
+	public void onThrow(TNTThrowEvent event)
+	{
+		_tnt.add(event.getTNT());
+	}
+	
+	@EventHandler
+	public void onExplode(EntityExplodeEvent event)
+	{
+		if (_tnt.contains(event.getEntity()))
+		{
+			_tnt.remove(event.getEntity());
+		}
+	}
+
+	@EventHandler
+	public void onPlace(PlayerInteractEvent event)
+	{
+		if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
+			return;
+
+		if (!Manager.GetGame().IsLive())
+			return;
+
+		if (!Manager.IsAlive(event.getPlayer()))
+			return;
+
+		if (!Kit.HasKit(event.getPlayer()))
+			return;
+
+		if (!UtilInv.IsItem(event.getItem(), Material.STONE_SPADE, (byte) 0))
+			return;
+		
+		_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw(), getFace(event.getPlayer().getLocation().getYaw())));
+	}
+	
+	@SuppressWarnings("deprecation")
+	@EventHandler
+	public void explode(ExplosionEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		for (Block block : event.GetBlocks())
+		{
+			if (_wallBlocks.contains(block.getLocation()))
+			{
+				if (block.getData() != 2)
+				{
+					block.setData((byte) 2);
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void explodeTNT(UpdateEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;	
+	
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		for (TNTPrimed tnt : _tnt)
+		{
+			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 1.5F).keySet())
+			{
+				if (_wallBlocks.contains(near.getLocation()))
+				{
+					tnt.setFuseTicks(0);
+				}
+			}
+		}
+	}
+	
+	private Set<Location> buildWall(final Location source, final float playerYaw, final BlockFace facing)
+	{
+		Set<Location> allWallBlocks = new HashSet<Location>();
+		Set<Location> baseWallBlocks = new HashSet<Location>();
+		
+		Location centerWallBlock = source.getBlock().getRelative(facing).getRelative(BlockFace.UP).getLocation();
+		
+		float leftYaw = playerYaw - 90;
+		float rightYaw = playerYaw + 90;
+		
+		BlockFace leftSide = getFace(leftYaw);
+		BlockFace rightSide = getFace(rightYaw);
+		
+		baseWallBlocks.add(centerWallBlock.getBlock().getRelative(leftSide).getRelative(leftSide).getLocation());
+		baseWallBlocks.add(centerWallBlock.getBlock().getRelative(leftSide).getLocation());
+		baseWallBlocks.add(centerWallBlock);
+		baseWallBlocks.add(centerWallBlock.getBlock().getRelative(rightSide).getLocation());
+		baseWallBlocks.add(centerWallBlock.getBlock().getRelative(rightSide).getRelative(rightSide).getLocation());
+		
+		for (Location base : baseWallBlocks)
+		{
+			for (int height = 0 ; height < 3 ; height++)
+			{
+				allWallBlocks.add(base.clone().add(0, height, 0));
+			}
+		}
+		for (Location block : allWallBlocks)
+		{
+			block.getBlock().setType(Material.SMOOTH_BRICK);
+			block.getWorld().playEffect(block, Effect.STEP_SOUND, 1.0F);
+		}
+		return allWallBlocks;
+	}
+	
+	private BlockFace getFace(float yaw)
+	{
+		if (yaw < 0)
+			yaw = yaw * (-1);
+		
+		return axis[Math.round(yaw / 90F) & 0x3];
+	}
+}

From 616c444c16d0bc7f595b93eb907d146a0e6c66dc Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sun, 12 Jul 2015 18:15:33 -0400
Subject: [PATCH 07/70] Added some things and stuff

---
 .../game/games/lobbers/BombLobbers.java       | 11 ++++++--
 .../game/games/lobbers/kits/KitArmorer.java   | 20 +++++++++++--
 .../games/lobbers/kits/perks/PerkWaller.java  | 28 +++++++++++++------
 3 files changed, 45 insertions(+), 14 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 cbdc955e4..822efa06e 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
@@ -56,11 +56,16 @@ public class BombLobbers extends TeamGame
 				new KitWaller(manager)
 				}, new String[]
 						{
-				"Throw TNT to blow up your enemies!",
-				"Click with TNT to throw"
+				"Fight against your enemies using",
+				"the power of explosives!",
+				"",
+				"Left click TNT to throw at your enemy.",
+				"Last team alive wins!",
+				"Kaboom!"
 						});
 		
 		DamageSelf = false;
+		DamageTeamSelf = false;
 
 		WorldWaterDamage = 5;
 		
@@ -174,7 +179,7 @@ public class BombLobbers extends TeamGame
 		_throwers.remove(tnt);
 		_teams.remove(tnt);
 		
-		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 5))
+		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
 		{
 			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
 		}
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 de1651826..be7f2c64a 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
@@ -1,6 +1,7 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
@@ -31,14 +32,23 @@ public class KitArmorer extends Kit
 						}, EntityType.ZOMBIE,
 				new ItemStack(Material.AIR));
 	}
-
+	
 	@Override
-	public void GiveItems(Player player)
+	public void ApplyKit(Player player)
 	{
+		UtilInv.Clear(player);
+		
+		for (Perk perk : GetPerks())
+			perk.Apply(player);
+		
+		GiveItemsCall(player);
+		
 		player.getInventory().setHelmet(new ItemBuilder(Material.GOLD_HELMET).setUnbreakable(true).build());
 		player.getInventory().setChestplate(new ItemBuilder(Material.GOLD_CHESTPLATE).setUnbreakable(true).build());
 		player.getInventory().setLeggings(new ItemBuilder(Material.GOLD_LEGGINGS).setUnbreakable(true).build());
 		player.getInventory().setBoots(new ItemBuilder(Material.GOLD_BOOTS).setUnbreakable(true).build());
+		
+		UtilInv.Update(player);
 	}
 	
 	@Override
@@ -50,4 +60,10 @@ public class KitArmorer extends Kit
 		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/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index 187ab2a49..211110b66 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -1,6 +1,7 @@
 package nautilus.game.arcade.game.games.lobbers.kits.perks;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import mineplex.core.common.util.C;
@@ -75,7 +76,9 @@ public class PerkWaller extends Perk
 		if (!UtilInv.IsItem(event.getItem(), Material.STONE_SPADE, (byte) 0))
 			return;
 		
-		_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw(), getFace(event.getPlayer().getLocation().getYaw())));
+		UtilInv.remove(event.getPlayer(), Material.STONE_SPADE, (byte) 0, 1);
+		
+		_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw()));
 	}
 	
 	@SuppressWarnings("deprecation")
@@ -85,13 +88,18 @@ public class PerkWaller extends Perk
 		if (!Manager.GetGame().IsLive())
 			return;
 		
-		for (Block block : event.GetBlocks())
+		Iterator<Block> iterator = event.GetBlocks().iterator();
+		
+		while (iterator.hasNext())
 		{
+			Block block = iterator.next();
+			
 			if (_wallBlocks.contains(block.getLocation()))
 			{
 				if (block.getData() != 2)
 				{
 					block.setData((byte) 2);
+					iterator.remove();
 				}
 			}
 		}
@@ -108,7 +116,7 @@ public class PerkWaller extends Perk
 		
 		for (TNTPrimed tnt : _tnt)
 		{
-			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 1.5F).keySet())
+			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 2.0F).keySet())
 			{
 				if (_wallBlocks.contains(near.getLocation()))
 				{
@@ -118,8 +126,11 @@ public class PerkWaller extends Perk
 		}
 	}
 	
-	private Set<Location> buildWall(final Location source, final float playerYaw, final BlockFace facing)
+	@SuppressWarnings("deprecation")
+	private Set<Location> buildWall(final Location source, final float playerYaw)
 	{
+		BlockFace facing = getFace(playerYaw + 180F);
+		
 		Set<Location> allWallBlocks = new HashSet<Location>();
 		Set<Location> baseWallBlocks = new HashSet<Location>();
 		
@@ -147,16 +158,15 @@ public class PerkWaller extends Perk
 		for (Location block : allWallBlocks)
 		{
 			block.getBlock().setType(Material.SMOOTH_BRICK);
-			block.getWorld().playEffect(block, Effect.STEP_SOUND, 1.0F);
+			block.getBlock().setData((byte) 0);
+			
+			block.getWorld().playEffect(block, Effect.STEP_SOUND, block.getBlock().getType());
 		}
 		return allWallBlocks;
 	}
 	
 	private BlockFace getFace(float yaw)
 	{
-		if (yaw < 0)
-			yaw = yaw * (-1);
-		
-		return axis[Math.round(yaw / 90F) & 0x3];
+        return axis[Math.round(yaw / 90f) & 0x3];
 	}
 }

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 08/70] 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 df6065978615de643e472a26cc090fe68afa9932 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 13 Jul 2015 12:14:25 -0400
Subject: [PATCH 09/70] Core edits

---
 .../game/games/lobbers/BombLobbers.java       | 25 ++++++++++++++++++
 .../games/lobbers/kits/perks/PerkWaller.java  | 26 -------------------
 2 files changed, 25 insertions(+), 26 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 822efa06e..89b3fe351 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
@@ -1,6 +1,7 @@
 package nautilus.game.arcade.game.games.lobbers;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.Map.Entry;
 
 import mineplex.core.common.util.F;
@@ -13,6 +14,7 @@ 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.explosion.ExplosionEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
@@ -31,6 +33,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
@@ -231,6 +234,28 @@ public class BombLobbers extends TeamGame
 		}
 	}
 	
+	
+	@SuppressWarnings("deprecation")
+	@EventHandler
+	public void damageBlocks(ExplosionEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+
+		Iterator<Block> iterator = event.GetBlocks().iterator();
+
+		while (iterator.hasNext())
+		{
+			Block block = iterator.next();
+			
+			if (block.getData() == 0)
+			{
+				block.setData((byte) 2);
+				iterator.remove();
+			}
+		}
+	}
+
 	private GameTeam getSide(Location entityLoc)
 	{		
 		Location nearest = UtilAlg.findClosest(entityLoc, new ArrayList<Location>(_averageSpawns.values()));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index 211110b66..82c0f2290 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -1,7 +1,6 @@
 package nautilus.game.arcade.game.games.lobbers.kits.perks;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import mineplex.core.common.util.C;
@@ -9,7 +8,6 @@ import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilInv;
-import mineplex.core.explosion.ExplosionEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
@@ -81,30 +79,6 @@ public class PerkWaller extends Perk
 		_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw()));
 	}
 	
-	@SuppressWarnings("deprecation")
-	@EventHandler
-	public void explode(ExplosionEvent event)
-	{
-		if (!Manager.GetGame().IsLive())
-			return;
-		
-		Iterator<Block> iterator = event.GetBlocks().iterator();
-		
-		while (iterator.hasNext())
-		{
-			Block block = iterator.next();
-			
-			if (_wallBlocks.contains(block.getLocation()))
-			{
-				if (block.getData() != 2)
-				{
-					block.setData((byte) 2);
-					iterator.remove();
-				}
-			}
-		}
-	}
-	
 	@EventHandler
 	public void explodeTNT(UpdateEvent event)
 	{

From ca2759148578a880b22904dd5fd6d9169ec7e36d Mon Sep 17 00:00:00 2001
From: Aaron Brock <TheMineBench@gmail.com>
Date: Tue, 14 Jul 2015 03:36:41 -0400
Subject: [PATCH 10/70] Added ChestComponent

Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
---
 .../game/components/team/SimpleTeam.php       | 12 ++-
 .../components/team/SimpleTeamManager.php     |  3 +-
 .../gameengine/game/components/team/Team.php  | 21 +----
 .../game/components/team/TeamDealer.php       | 10 ++-
 .../game/games/sg/ChestComponent.php          | 82 +++++++++++++++++++
 5 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/ChestComponent.php

diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeam.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeam.php
index 2074b2597..0daba5e9b 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeam.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeam.php
@@ -64,7 +64,12 @@ class SimpleTeam implements Team {
      */
     function getName()
     {
-        $this->name;
+        return $this->name;
+    }
+
+    function getDisplayName()
+    {
+        return $this->getColor() . $this->getName();
     }
 
     /**
@@ -72,7 +77,8 @@ class SimpleTeam implements Team {
      */
     function getColor()
     {
-        $this->color;
+        return $this->color;
     }
 
-}
\ No newline at end of file
+}
+
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeamManager.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeamManager.php
index f0b2cc655..e08968b23 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeamManager.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/SimpleTeamManager.php
@@ -11,6 +11,7 @@ namespace mineplex\plugin\gameengine\game\components\team;
 
 use mineplex\plugin\gameengine\arenas\Arena;
 use mineplex\plugin\util\UtilArray;
+use pocketmine\item\LeatherTunic;
 use pocketmine\Player;
 use InvalidArgumentException;
 
@@ -36,6 +37,7 @@ class SimpleTeamManager implements TeamManager {
 
     function addTeam(Team $team)
     {
+        print "adding team: " . $team->getDisplayName() ."\n";
         $this->teams[$team->getName()] = $team;
     }
 
@@ -91,5 +93,4 @@ class SimpleTeamManager implements TeamManager {
         $team->addPlayer_forUseByManagerOnly($player);
 
     }
-
 }
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/Team.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/Team.php
index 68d0721c6..0a36cedb0 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/Team.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/Team.php
@@ -8,26 +8,10 @@
 
 namespace mineplex\plugin\gameengine\game\components\team;
 
-
 use pocketmine\Player;
 
 interface Team {
 
-    function addPlayer_forUseByManagerOnly(Player $player);
-
-    function removePlayer_forUseByManagerOnly(Player $player);
-
-    /**
-     * @return Player[]
-     */
-    function getPlayers();
-
-    /**
-     * @param Player $player
-     * @return bool
-     */
-    function hasPlayer(Player $player);
-
     /**
      * @return string
      */
@@ -36,6 +20,9 @@ interface Team {
     /**
      * @return string
      */
+    function getDisplayName();
+
+
     function getColor();
 
-}
\ No newline at end of file
+}
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/TeamDealer.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/TeamDealer.php
index c2e31bcea..5d5747907 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/TeamDealer.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/team/TeamDealer.php
@@ -43,12 +43,18 @@ class TeamDealer implements Listener {
     function deal()
     {
         $teams = array_values($this->teamManager->getTeams());
+
         $counter = 0;
+
         foreach ($this->arena->getPlayers() as $player)
         {
-            Server::getInstance()->broadcastMessage($counter % count($teams));
-            $this->teamManager->setPlayersTeam($player, $teams[$counter % count($teams)]);
+
             $counter++;
+            Server::getInstance()->broadcastMessage("counter: " . ($counter));
+            Server::getInstance()->broadcastMessage("count: " . count($teams));
+            Server::getInstance()->broadcastMessage("total: " . ($counter % count($teams)));
+            $this->teamManager->setPlayersTeam($player, $teams[$counter % count($teams)]);
+
         }
     }
 
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/ChestComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/ChestComponent.php
new file mode 100644
index 000000000..278baceb0
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/ChestComponent.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exerosis
+ * Date: 7/14/2015
+ * Time: 3:26 AM
+ */
+
+namespace mineplex\plugin\gameengine\game\games\sg;
+
+
+use mineplex\plugin\gameengine\arenas\Arena;
+use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent;
+use mineplex\plugin\gameengine\arenas\events\ArenaStartEvent;
+use mineplex\plugin\gameengine\game\components\gamestate\events\GameStateChangeEvent;
+use mineplex\plugin\gameengine\game\components\gamestate\GameState;
+use mineplex\plugin\gameengine\game\components\gamestate\GameStateComponent;
+use mineplex\plugin\gameengine\game\components\world\event\WorldLoadSuccessEvent;
+use mineplex\plugin\gameengine\game\components\world\WorldComponent;
+use pocketmine\event\HandlerList;
+use pocketmine\event\Listener;
+use pocketmine\Server;
+
+class ChestComponent implements Listener {
+
+    private $arena;
+    private $worldComponent;
+
+    //You can put what you want in the constructor, but for chests this is all you should need.
+    /**
+     * @param Arena $arena
+     * @param WorldComponent $worldComponent
+     */
+    function __construct(Arena $arena, WorldComponent $worldComponent)
+    {
+        $this->arena = $arena;
+        $this->worldComponent = $worldComponent;
+        Server::getInstance()->getPluginManager()->registerEvents($this, $arena->getPlugin());
+        //Don't to game start stuff here cause there might be other components not enabled yet
+    }
+
+    function onStart(ArenaStartEvent $event)
+    {
+        if ($event->getArena() !== $this->arena)
+            return;
+        //Do stuff on Game start if you want
+    }
+
+    function onLoad(WorldLoadSuccessEvent $event)
+    {
+        if ($event->getArena() !== $this->arena)
+            return;
+
+        //Called after the world is loaded
+    }
+
+    function onStateChange(GameStateChangeEvent $event)
+    {
+        if ($event->getArena() !== $this->arena)
+            return;
+        //Change this to what ever state you want
+        if ($event->getToGameState() == GameState::GAME)
+        {
+            //Do this when the state becomes GAME
+        }
+        elseif ($event->getFromGameState() == GameState::GAME)
+        {
+            //Do this when the state is no longer GAME
+        }
+    }
+
+
+    function onEnd(ArenaEndEvent $event)
+    {
+        if ($event->getArena() !== $this->arena)
+            return;
+
+        HandlerList::unregisterAll($this);
+
+        //Do end of game stuff if you need to
+    }
+}
\ No newline at end of file

From 5f73e50b2a1c5ef96e7dcb62d68f50bd6487169b Mon Sep 17 00:00:00 2001
From: Aaron Brock <TheMineBench@gmail.com>
Date: Tue, 14 Jul 2015 04:05:06 -0400
Subject: [PATCH 11/70] fix

---
 .../plugin/gameengine/game/games/sg/SurvivalGames.php    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php
index 395b2a394..d8e511fba 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php
@@ -10,6 +10,7 @@ namespace mineplex\plugin\gameengine\game\games\sg;
 
 use mineplex\plugin\gameengine\arenas\Arena;
 use mineplex\plugin\gameengine\game\components\countdown\GameStateCountdown;
+use mineplex\plugin\gameengine\game\components\countdown\LobbyCountdown;
 use mineplex\plugin\gameengine\game\components\feature\features\DeathSpectate;
 use mineplex\plugin\gameengine\game\components\feature\features\FreezePlayers;
 use mineplex\plugin\gameengine\game\components\feature\features\JoinSpectate;
@@ -29,12 +30,10 @@ use mineplex\plugin\gameengine\game\components\spectate\GameModeSpectateComponen
 use mineplex\plugin\gameengine\game\components\team\SimpleTeam;
 use mineplex\plugin\gameengine\game\components\team\SimpleTeamManager;
 use mineplex\plugin\gameengine\game\components\team\TeamDealer;
+use mineplex\plugin\gameengine\game\components\victorytype\LMSVictoryType;
 use mineplex\plugin\gameengine\game\components\world\TimeComponent;
 use mineplex\plugin\gameengine\game\components\world\WorldComponent;
 use mineplex\plugin\gameengine\game\Game;
-use mineplex\plugin\gameengine\game\components\countdown\LobbyCountdown;
-use mineplex\plugin\gameengine\game\components\feature\Feature;
-use mineplex\plugin\gameengine\game\components\victorytype\LMSVictoryType;
 
 class SurvivalGames implements Game {
 
@@ -51,7 +50,7 @@ class SurvivalGames implements Game {
         $teamManager = new SimpleTeamManager($arena, [new SimpleTeam('Bench', '§6'), new SimpleTeam('Not Bench', '§b')]);
         new TeamDealer($arena, $teamManager);
 
-
+        new ChestComponent($arena, $worldComponent);
 
         new LobbyComponent($arena);
 
@@ -64,7 +63,7 @@ class SurvivalGames implements Game {
 
         $stopEveryThing = array(new NoBlockBreak($arena), new NoBlockPlace($arena),new NoDropItem($arena), new NoPickUpItem($arena));
 
-        /** @var Feature[][] $features */
+
         $features = array(
 
             GameState::PRE_GAME => array( $stopEveryThing, $noDamage, $joinSpectate, new FreezePlayers($arena, $spectateComponent)),

From 1e1cf6403deec95f121fb874dc9b481ba6383a01 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 14 Jul 2015 13:31:41 -0400
Subject: [PATCH 12/70] Added achievements

---
 .../core/achievement/Achievement.java         |  46 ++++++
 .../core/achievement/AchievementCategory.java |  21 +--
 .../game/games/lobbers/BombLobbers.java       | 131 ++++++++++++++++--
 .../game/games/lobbers/kits/KitArmorer.java   |   2 +-
 .../game/games/lobbers/kits/KitDetonator.java |   6 +-
 .../game/games/lobbers/kits/KitWaller.java    |   2 +-
 .../games/lobbers/kits/perks/PerkWaller.java  |   4 +-
 .../games/lobbers/trackers/Tracker6Kill.java  |  38 +++++
 .../lobbers/trackers/TrackerBestTeam.java     |  51 +++++++
 .../lobbers/trackers/TrackerBlastProof.java   |  35 +++++
 .../lobbers/trackers/TrackerNoDamage.java     |  69 +++++++++
 .../lobbers/trackers/TrackerTNTThrown.java    |  26 ++++
 12 files changed, 402 insertions(+), 29 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java
 create 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/TrackerBlastProof.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index a1d818cca..a058b7496 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -630,6 +630,52 @@ public enum Achievement
 			new String[]{"Kill 2 enemies while blinded from", "a single flashbang"},
 			new int[]{1},
 			AchievementCategory.MINE_STRIKE),
+			
+	//Bomb Lobbers
+	BOMB_LOBBERS_WINS("Master Bomber", 1200,
+			new String[]{"Bomb Lobbers.Wins"},
+			new String[]{"Win 100 games of Bomb Lobbers"},
+			new int[] {100},
+			AchievementCategory.BOMB_LOBBERS),
+			
+	BOMB_LOBBERS_PROFESSIONAL_LOBBER("Professional Lobber", 1000,
+			new String[]{"Bomb Lobbers.Thrown"},
+			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, 
+			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)
+	
+			
+//	BOMB_LOBBERS_
 	;
 
 	private String _name;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
index d777224ac..bffc840e7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
@@ -32,11 +32,11 @@ public enum AchievementCategory
 
 	UHC("Ultra Hardcore", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
+			Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, null),
 
 	WIZARDS("Wizards", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
+			Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Witch Doctor Kit"),
 
 	CASTLE_SIEGE("Castle Siege", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"),
@@ -45,7 +45,7 @@ public enum AchievementCategory
 
 	BLOCK_HUNT("Block Hunt", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.GRASS, 0, GameCategory.CLASSICS, null),
+			Material.GRASS, 0, GameCategory.CLASSICS, "Infestor Kit"),
 
 	SMASH_MOBS("Super Smash Mobs", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -57,7 +57,7 @@ public enum AchievementCategory
 
 	DRAW_MY_THING("Draw My Thing", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
-			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, null),
+			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "Extra Tools Kit"),
 
 	CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM"},
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -74,7 +74,7 @@ public enum AchievementCategory
 	
 	DRAGON_ESCAPE("Dragon Escape", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
-			Material.DRAGON_EGG, 0, GameCategory.ARCADE, null),
+			Material.DRAGON_EGG, 0, GameCategory.ARCADE, "Digger Kit"),
 	
 	SHEEP_QUEST("Sheep Quest", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -86,7 +86,7 @@ public enum AchievementCategory
 	
 	ONE_IN_THE_QUIVER("One in the Quiver", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.BOW, 0, GameCategory.ARCADE, null),
+			Material.BOW, 0, GameCategory.ARCADE, "Slam Shooter Kit"),
 	
 	SUPER_PAINTBALL("Super Paintball", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -110,7 +110,7 @@ public enum AchievementCategory
 			
 	SNAKE("Snake", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.WOOL, 4, GameCategory.ARCADE, null),
+			Material.WOOL, 4, GameCategory.ARCADE, "Reversal Snake Kit"),
 			
 	BACON_BRAWL("Bacon Brawl", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -118,9 +118,12 @@ 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.TNT, 0, GameCategory.ARCADE, "Waller Kit");
 	
-
 	private String _name;
 	private String[] _statsToPull;
 	private StatDisplay[] _statDisplays;
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 89b3fe351..41027947d 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
@@ -17,6 +17,9 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.explosion.ExplosionEvent;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.combat.CombatComponent;
+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;
@@ -27,6 +30,11 @@ import nautilus.game.arcade.game.games.lobbers.kits.KitArmorer;
 import nautilus.game.arcade.game.games.lobbers.kits.KitDetonator;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
 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.TrackerNoDamage;
+import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
 import nautilus.game.arcade.kit.Kit;
 
 import org.bukkit.ChatColor;
@@ -48,7 +56,10 @@ public class BombLobbers extends TeamGame
 	
 	private NautHashMap<TNTPrimed, String> _throwers = new NautHashMap<TNTPrimed, String>();
 	private NautHashMap<TNTPrimed, GameTeam> _teams = new NautHashMap<TNTPrimed, GameTeam>();
+	
+	private NautHashMap<Player, Double> _kills = new NautHashMap<Player, Double>();
 		
+	@SuppressWarnings("unchecked")
 	public BombLobbers(ArcadeManager manager)
 	{
 		super(manager, GameType.Lobbers, new Kit[]
@@ -66,10 +77,8 @@ public class BombLobbers extends TeamGame
 				"Last team alive wins!",
 				"Kaboom!"
 						});
-		
 		DamageSelf = false;
-		DamageTeamSelf = false;
-
+		
 		WorldWaterDamage = 5;
 		
 		PrepareFreeze = false;
@@ -83,12 +92,67 @@ public class BombLobbers extends TeamGame
 		ItemDrop = false;
 		
 		BlockPlace = false;
-		
-		DamageFall = true;
-		
+				
 		Manager.GetExplosion().SetLiquidDamage(false);
 		
 		HungerSet = 20;
+		
+		registerStatTrackers(new Tracker6Kill(this), new TrackerBestTeam(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this));
+	}
+	
+	public void addKill(Player player)
+	{
+		_kills.put(player, _kills.containsKey(player) ? _kills.get(player) + 1 : 1);
+	}
+	
+	public void addAssist(Player player)
+	{
+		_kills.put(player, _kills.containsKey(player) ? _kills.get(player) + .5 : .5);
+	}
+	
+	public double getKills(Player player)
+	{
+		if (_kills.containsKey(player))
+		{
+			return _kills.get(player);
+		}
+		else
+		{
+			_kills.put(player, 0.0);
+			return 0;
+		}
+	}
+	
+	@EventHandler
+	public void onKill(CombatDeathEvent event)
+	{
+		if (!IsLive())
+			return;
+		
+		Player dead = UtilPlayer.searchExact(((Player) event.GetEvent().getEntity()).getName());
+		
+		if (!IsAlive(dead))
+			return;
+		
+		for (CombatComponent damager : event.GetLog().GetAttackers())
+		{
+			Player killer = UtilPlayer.searchExact(damager.GetName());
+			
+			if (killer == null || !killer.isOnline())
+				continue;
+			
+			if (IsAlive(killer))
+			{
+				if (event.GetLog().GetKiller() == damager)
+				{				
+					addKill(killer);
+				}
+				else
+				{
+					addAssist(killer);
+				}
+			}
+		}
 	}
 	
 	@EventHandler
@@ -234,8 +298,16 @@ public class BombLobbers extends TeamGame
 		}
 	}
 	
+	@EventHandler
+	public void nerfTNT(CustomDamageEvent event)
+	{
+		if (event.GetCause().toString().contains("EXPLOSION"))
+		{
+			event.AddMod("Armor", "Damage Nerf", -(event.GetDamage() * .333), false);
+		}
+	}
+	
 	
-	@SuppressWarnings("deprecation")
 	@EventHandler
 	public void damageBlocks(ExplosionEvent event)
 	{
@@ -248,14 +320,49 @@ public class BombLobbers extends TeamGame
 		{
 			Block block = iterator.next();
 			
-			if (block.getData() == 0)
-			{
-				block.setData((byte) 2);
-				iterator.remove();
-			}
+			if (!shouldRemoveFromExplosion(block))
+				continue;
+			
+			event.GetBlocks().remove(block);
 		}
 	}
 
+	//Boolean = remove
+	@SuppressWarnings("deprecation")
+	public boolean shouldRemoveFromExplosion(Block block)
+	{
+		//Stone
+		if (block.getTypeId() == 1)
+		{
+			block.setTypeId(4);
+			return false;
+		}
+
+		//Stone Brick
+		else if (block.getTypeId() == 98)
+		{
+			block.setData((byte) 2);	
+			return false;
+		}
+
+		//Grass
+		else if (block.getTypeId() == 2)
+		{
+			block.setTypeId(3);
+			return false;
+		}
+
+		//Wood Planks
+		else if (block.getTypeId() == 5)
+		{
+			block.setData((byte) 2);
+			return false;
+		}
+
+		//Other
+		return true;
+	}
+	
 	private GameTeam getSide(Location entityLoc)
 	{		
 		Location nearest = UtilAlg.findClosest(entityLoc, new ArrayList<Location>(_averageSpawns.values()));
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 be7f2c64a..47ecd4222 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
@@ -20,7 +20,7 @@ public class KitArmorer extends Kit
 
 	public KitArmorer(ArcadeManager manager)
 	{
-		super(manager, "Armorer", KitAvailability.Free, 0, new String[]
+		super(manager, "Armorer", KitAvailability.Gem, 2000, new String[]
 				{
 				"He uses his expert armor-making",
 				"skills to block excess damage!",
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index 6c8c3768f..82213872f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -27,9 +27,9 @@ public class KitDetonator extends Kit
 
 	public KitDetonator(ArcadeManager manager)
 	{
-		super(manager, "Detonator", KitAvailability.Free, 0, new String[]
+		super(manager, "Detonator", KitAvailability.Gem, 4000, new String[]
 				{
-				"He doesn't like to wait.",
+				"He doesn't like to wait. Max fuse of 3 and min fuse of 2.",
 				"",
 				C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Fuse Time.",
 				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time."
@@ -109,7 +109,7 @@ public class KitDetonator extends Kit
 		//Left
 		else if (UtilEvent.isAction(event, ActionType.L))
 		{
-			if (amount <= 1)
+			if (amount <= 2)
 				return;
 			
 			UtilInv.remove(event.getPlayer(), Material.LEVER, (byte) 0, 1);
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 b427930a1..f8b7e136f 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
@@ -17,7 +17,7 @@ public class KitWaller extends Kit
 
 	public KitWaller(ArcadeManager manager)
 	{
-		super(manager, "Waller", KitAvailability.Free, 0, new String[]
+		super(manager, "Waller", KitAvailability.Achievement, 0, new String[]
 				{
 				"When the times get tough,",
 				"build yourself a wall!"
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index 82c0f2290..81b16ed8d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -35,9 +35,7 @@ public class PerkWaller extends Perk
 	{
 		super("Waller", new String[]
 				{
-				C.cYellow + "Click Block" + C.cGray + " with shovel to " + C.cGreen + "Place Wall",
-				C.cGray + "Walls can absorb 1 hit before breaking.",
-				C.cGray + "TNT that touches a wall will explode instantly."
+				C.cYellow + "Click Block" + C.cGray + " with shovel to " + C.cGreen + "Place Wall"
 				});
 	}
 	
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
new file mode 100644
index 000000000..ee8bc27f5
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java
@@ -0,0 +1,38 @@
+package nautilus.game.arcade.game.games.lobbers.trackers;
+
+import mineplex.core.common.util.UtilServer;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.games.lobbers.BombLobbers;
+import nautilus.game.arcade.stats.StatTracker;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+public class Tracker6Kill extends StatTracker<Game>
+{
+	
+	public Tracker6Kill(Game game)
+	{
+		super(game);
+	}
+	
+	@EventHandler
+	public void onEndgame(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.End)
+			return;
+		
+		if (getGame() instanceof BombLobbers)
+		{
+			for (Player player : UtilServer.getPlayers())
+			{
+				if (((BombLobbers) getGame()).getKills(player) >= 6.0)
+				{
+					addStat(player, "Killer", 1, true, false);
+				}
+			}
+		}
+	}
+}
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
new file mode 100644
index 000000000..fb37cc3ae
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java
@@ -0,0 +1,51 @@
+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/TrackerBlastProof.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java
new file mode 100644
index 000000000..7d4e8f627
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java
@@ -0,0 +1,35 @@
+package nautilus.game.arcade.game.games.lobbers.trackers;
+
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.games.lobbers.kits.KitArmorer;
+import nautilus.game.arcade.stats.StatTracker;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+public class TrackerBlastProof extends StatTracker<Game>
+{
+	
+	public TrackerBlastProof(Game game)
+	{
+		super(game);
+	}
+	
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onGameEnd(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.End)
+			return;
+		
+		for (Player winner : getGame().getWinners())
+		{
+			if (getGame().GetKit(winner) instanceof KitArmorer)
+			{
+				addStat(winner, "BlastProof", 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
new file mode 100644
index 000000000..7ad9f8550
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java
@@ -0,0 +1,69 @@
+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;
+import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.stats.StatTracker;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+public class TrackerNoDamage extends StatTracker<Game>
+{
+	private Set<String> _noDamage = 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)
+		{
+			Player player = UtilPlayer.searchExact(name);
+			
+			if (player == null || !player.isOnline())
+				continue;
+			
+			addStat(player, "JellySkin", 1, true, false);
+		}
+	}
+
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	public void onDamage(CustomDamageEvent event)
+	{
+		if (!getGame().IsLive())
+			return;
+
+		if (event.GetDamageePlayer() == null || !event.GetDamageePlayer().isOnline())
+			return;
+		
+		if (_noDamage.contains(event.GetDamageePlayer().getName()))
+		{
+			_noDamage.remove(event.GetDamageePlayer().getName());
+		}
+	}
+}
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
new file mode 100644
index 000000000..0aa2d93e6
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java
@@ -0,0 +1,26 @@
+package nautilus.game.arcade.game.games.lobbers.trackers;
+
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
+import nautilus.game.arcade.stats.StatTracker;
+
+import org.bukkit.event.EventHandler;
+
+public class TrackerTNTThrown extends StatTracker<Game>
+{
+	
+	public TrackerTNTThrown(Game game)
+	{
+		super(game);
+	}
+	
+	@EventHandler
+	public void onThrow(TNTThrowEvent event)
+	{
+		if (!getGame().IsLive())
+			return;
+	
+		addStat(event.getPlayer(), "Thrown", 1, false, false);
+	}
+
+}

From 52dd9df834c13f318cedfc124eeaa190a6c6e29b Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Fri, 17 Jul 2015 11:39:01 -0500
Subject: [PATCH 13/70] Motd changes.

---
 .../src/mineplex/bungee/motd/MotdManager.java                    | 1 +
 1 file changed, 1 insertion(+)

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 941527a80..49e6f6ae1 100644
--- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
+++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
@@ -41,6 +41,7 @@ public class MotdManager implements Listener, Runnable
 			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("                     §d§lRank Sale §a§l40% Off");
+			//lines.add("                        §f§l◄§c§lMAINTENANCE§f§l►");
 			
 			updateMainMotd("                §b§l§m   §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m   §r", lines);
 			System.out.println("Updated Bungee MOTD");

From 2dc2b8792c30f223381387b11a6be6b7a438d195 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Fri, 17 Jul 2015 17:01:24 -0400
Subject: [PATCH 14/70] Fixes, updates

---
 .../game/games/lobbers/BombLobbers.java       | 121 ++++++++----------
 .../game/games/lobbers/kits/KitArmorer.java   |   2 +-
 .../game/games/lobbers/kits/KitDetonator.java |   2 +-
 .../game/games/lobbers/kits/KitWaller.java    |   5 +-
 .../lobbers/kits/perks/PerkCraftman.java      |  27 ++--
 .../lobbers/trackers/TrackerBlastProof.java   |   3 +
 6 files changed, 81 insertions(+), 79 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 41027947d..4452e6ddf 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
@@ -15,11 +15,12 @@ import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.explosion.ExplosionEvent;
+import mineplex.core.projectile.IThrown;
+import mineplex.core.projectile.ProjectileUser;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.combat.CombatComponent;
 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;
@@ -37,11 +38,12 @@ import nautilus.game.arcade.game.games.lobbers.trackers.TrackerNoDamage;
 import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
 import nautilus.game.arcade.kit.Kit;
 
-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.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
@@ -49,8 +51,9 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.util.Vector;
 
-public class BombLobbers extends TeamGame
+public class BombLobbers extends TeamGame implements IThrown
 {
 	private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
 	
@@ -72,12 +75,11 @@ public class BombLobbers extends TeamGame
 						{
 				"Fight against your enemies using",
 				"the power of explosives!",
-				"",
 				"Left click TNT to throw at your enemy.",
-				"Last team alive wins!",
-				"Kaboom!"
+				"Last team alive wins!"
 						});
-		DamageSelf = false;
+		DamageFall = true;
+		DamageEvP = true;
 		
 		WorldWaterDamage = 5;
 		
@@ -195,6 +197,7 @@ public class BombLobbers extends TeamGame
 		tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
 
 		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
+		Manager.GetProjectile().AddThrow(tnt, event.getPlayer(), this, -1L, true, false, false, .2F);
 		
 		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
 		
@@ -265,15 +268,7 @@ public class BombLobbers extends TeamGame
 		{
 			if (tnt.getKey() != null && tnt.getKey().isValid() && !tnt.getKey().isOnGround())
 			{
-				if (tnt.getValue().GetColor() == ChatColor.AQUA)
-				{
-					UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), -1, -1, 1, 1, 0,
-							ViewDist.LONG, UtilServer.getPlayers());
-					}
-				else
-				{
-					UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), 0.0F, 0.0F, 0.0F, 0.0F, 3,  ViewDist.LONG, UtilServer.getPlayers());
-				}
+				UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), tnt.getValue().GetColorBase().getRed(), tnt.getValue().GetColorBase().getGreen(), tnt.getValue().GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
 			}
 		}
 	}
@@ -293,21 +288,11 @@ public class BombLobbers extends TeamGame
 			{
 				player.damage(500);
 				UtilPlayer.message(player, F.main("Game", "You were killed for trying to cheat!"));
-				continue;
 			}
 		}
 	}
 	
-	@EventHandler
-	public void nerfTNT(CustomDamageEvent event)
-	{
-		if (event.GetCause().toString().contains("EXPLOSION"))
-		{
-			event.AddMod("Armor", "Damage Nerf", -(event.GetDamage() * .333), false);
-		}
-	}
-	
-	
+	@SuppressWarnings("deprecation")
 	@EventHandler
 	public void damageBlocks(ExplosionEvent event)
 	{
@@ -320,47 +305,22 @@ public class BombLobbers extends TeamGame
 		{
 			Block block = iterator.next();
 			
-			if (!shouldRemoveFromExplosion(block))
+			//Stone
+			if (block.getType() == Material.STONE)
+			{
+				block.setType(Material.COBBLESTONE);
+				iterator.remove();
 				continue;
-			
-			event.GetBlocks().remove(block);
-		}
-	}
+			}
 
-	//Boolean = remove
-	@SuppressWarnings("deprecation")
-	public boolean shouldRemoveFromExplosion(Block block)
-	{
-		//Stone
-		if (block.getTypeId() == 1)
-		{
-			block.setTypeId(4);
-			return false;
+			//Stone Brick
+			if (block.getType() == Material.SMOOTH_BRICK && block.getData() != 2)
+			{
+				block.setData((byte) 2);
+				iterator.remove();
+				continue;
+			}
 		}
-
-		//Stone Brick
-		else if (block.getTypeId() == 98)
-		{
-			block.setData((byte) 2);	
-			return false;
-		}
-
-		//Grass
-		else if (block.getTypeId() == 2)
-		{
-			block.setTypeId(3);
-			return false;
-		}
-
-		//Wood Planks
-		else if (block.getTypeId() == 5)
-		{
-			block.setData((byte) 2);
-			return false;
-		}
-
-		//Other
-		return true;
 	}
 	
 	private GameTeam getSide(Location entityLoc)
@@ -373,5 +333,34 @@ public class BombLobbers extends TeamGame
 		}
 		return null;
 	}
-	
+
+	@Override
+	public void Collide(LivingEntity target, Block block, ProjectileUser data)
+	{
+		if (!(target instanceof Player) || !(data.GetThrower() instanceof Player))
+			return;
+		
+		if (GetTeam((Player) target) == GetTeam((Player) data.GetThrower()))
+			return;
+			
+		data.GetThrown().setVelocity(new Vector());
+		
+		if (target != null)
+		{
+			UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown().getLocation(), target.getLocation()), .2, false, 0, 0.2, .4, true);
+			target.playEffect(EntityEffect.HURT);
+		}
+	}
+
+	@Override
+	public void Idle(ProjectileUser data)
+	{
+		
+	}
+
+	@Override
+	public void Expire(ProjectileUser data)
+	{
+		
+	}
 }
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 47ecd4222..b9184ad47 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
@@ -28,7 +28,7 @@ public class KitArmorer extends Kit
 				C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
 				}, new Perk[]
 						{
-				new PerkCraftman()
+				new PerkCraftman(5000)
 						}, EntityType.ZOMBIE,
 				new ItemStack(Material.AIR));
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index 82213872f..8536d1afb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -35,7 +35,7 @@ public class KitDetonator extends Kit
 				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time."
 				}, new Perk[]
 						{
-				new PerkCraftman()
+				new PerkCraftman(6000)
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.LEVER).build());
 	}
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 f8b7e136f..7d9d760e8 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
@@ -3,6 +3,7 @@ package nautilus.game.arcade.game.games.lobbers.kits;
 import mineplex.core.common.util.F;
 import mineplex.core.itemstack.ItemBuilder;
 import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
 import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkWaller;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -14,7 +15,6 @@ import org.bukkit.entity.Player;
 
 public class KitWaller extends Kit
 {
-
 	public KitWaller(ArcadeManager manager)
 	{
 		super(manager, "Waller", KitAvailability.Achievement, 0, new String[]
@@ -23,7 +23,8 @@ public class KitWaller extends Kit
 				"build yourself a wall!"
 				}, new Perk[]
 						{
-				new PerkWaller()
+				new PerkWaller(),
+				new PerkCraftman(6000)
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.SMOOTH_BRICK).setUnbreakable(true).build());
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index b99b833ae..686cd1186 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -5,11 +5,11 @@ import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
 import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.kit.Perk;
 
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
@@ -17,37 +17,46 @@ public class PerkCraftman extends Perk
 {
 	private Recharge _recharge;
 	
+	private final long _giveTime;
+	
 	public PerkCraftman()
+	{
+		this(4000);
+	}
+	
+	public PerkCraftman(long giveTime)
 	{
 		super("Craftman", new String[]
 				{
-				C.cGray + "Recieve 1 TNT every 2 seconds. Maximum of 3."
+				C.cGray + "Recieve 1 TNT every " + C.cYellow + giveTime / 1000 + C.cGray + " seconds. Maximum of 3."
 				});
 		
 		_recharge = Recharge.Instance;
+		_giveTime = giveTime;
 	}
 	
 	@EventHandler
 	public void give(UpdateEvent event)
 	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
 		if (!Manager.GetGame().IsLive())
 			return;
 		
 		for (Player player : Manager.GetGame().GetPlayers(true))
 		{
-			if (!_recharge.usable(player, "TNT Give"))
+			if (!Kit.HasKit(player))
 				continue;
-
-			_recharge.use(player, "TNT Give", Manager.GetGame().getGameLiveTime() >= 60000 ? 3000 : (Manager.GetGame().getGameLiveTime() >= 3000 ? 4000 : 5000), false, false);
 			
-			//Has 4
+			if (!_recharge.use(player, "Bomb Give", _giveTime, false, false))
+				continue;
+			
+			//Has 3
 			if (UtilInv.contains(player, Material.TNT, (byte) 0, 3))
 				continue;
 			
 			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(F.item("Throwing TNT")).build());
-
-			player.getWorld().playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 3.0F, 1.0F);
 		}
 	}
-
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java
index 7d4e8f627..af23a5b37 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java
@@ -24,6 +24,9 @@ public class TrackerBlastProof extends StatTracker<Game>
 		if (event.GetState() != GameState.End)
 			return;
 		
+		if (getGame().getWinners() == null)
+			return;
+		
 		for (Player winner : getGame().getWinners())
 		{
 			if (getGame().GetKit(winner) instanceof KitArmorer)

From 6edc923002ccdd11f2f9c8de3ff1015f2955f086 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sun, 19 Jul 2015 15:43:13 -0400
Subject: [PATCH 15/70] Changed mineplex.com/supporthub > mineplex.com/reports

---
 Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index d48239d6e..eaa6f0e2e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -329,7 +329,7 @@ public class Chat extends MiniPlugin
 			UtilPlayer.message(sender, F.main("Chat", 
 					"Accusing players of cheating in-game is against the rules."
 					+ "If you think someone is cheating, please gather evidence and report it at "
-					+ F.link("www.mineplex.com/supporthub/")));
+					+ F.link("www.mineplex.com/reports/")));
 			event.setCancelled(true);
 		}
 		else if (_playerLastMessage.containsKey(sender.getUniqueId()))

From 8b2b4c28265139fe86b9db2a40a31300a41d0853 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sun, 19 Jul 2015 15:51:34 -0400
Subject: [PATCH 16/70] Added to MPS

---
 Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java   | 2 +-
 .../src/nautilus/game/arcade/managers/GameHostManager.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index c5230d28f..dbb06498f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -27,7 +27,7 @@ public enum GameDisplay
 	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
 	HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
 	Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
-	Lobbers("Bomb Lobbers", Material.TNT, (byte) 0, GameCategory.ARCADE, 53),
+	Lobbers("Bomb Lobbers", Material.FIREWORK_CHARGE, (byte) 0, GameCategory.ARCADE, 53),
 	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
 	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
 	MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug
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..482dab324 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
@@ -84,6 +84,7 @@ public class GameHostManager implements Listener
 		ultraGames.add(GameType.SneakyAssassins);
 		ultraGames.add(GameType.TurfWars);
 		ultraGames.add(GameType.Spleef);
+		ultraGames.add(GameType.Lobbers);
 
 		//Hero Games
 		heroGames.add(GameType.ChampionsDominate);

From 87cc40fc0cb7fa7979fa18d44af0443992dff071 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sun, 19 Jul 2015 22:38:03 -0400
Subject: [PATCH 17/70] Fixed a few achievements

---
 .../stats/BridgesSniperStatTracker.java       | 24 +++++++-----
 .../stats/ElectrocutionStatTracker.java       | 31 ++++++++++++---
 .../stats/FirstSupplyDropOpenStatTracker.java | 24 +++++++-----
 .../stats/TheLongestShotStatTracker.java      | 11 ++++--
 .../stats/WinWithoutDyingStatTracker.java     | 28 ++++++-------
 .../WinWithoutOpeningChestStatTracker.java    | 28 +++++++------
 .../WinWithoutWearingArmorStatTracker.java    | 39 +++++++++++--------
 7 files changed, 116 insertions(+), 69 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java
index 7b10cb9b1..2322950cb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/BridgesSniperStatTracker.java
@@ -1,12 +1,12 @@
 package nautilus.game.arcade.stats;
 
-import mineplex.core.common.util.*;
-import mineplex.minecraft.game.core.combat.event.*;
-import nautilus.game.arcade.game.Game;
-import nautilus.game.arcade.game.games.bridge.*;
-import org.bukkit.entity.*;
-import org.bukkit.event.*;
-import org.bukkit.event.entity.*;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
+import nautilus.game.arcade.game.games.bridge.Bridge;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 
 public class BridgesSniperStatTracker extends StatTracker<Bridge>
 {
@@ -18,7 +18,7 @@ public class BridgesSniperStatTracker extends StatTracker<Bridge>
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
 	public void onCombatDeath(CombatDeathEvent event)
 	{
-		if (getGame().GetState() != Game.GameState.Live)
+		if (!getGame().IsLive())
 			return;
 
 		if (getGame().isBridgesDown())
@@ -31,6 +31,7 @@ public class BridgesSniperStatTracker extends StatTracker<Bridge>
 			return;
 
 		Player killer = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
+		
 		if (killer == null)
 			return;
 
@@ -41,13 +42,16 @@ public class BridgesSniperStatTracker extends StatTracker<Bridge>
 			return;
 
 		Player player = UtilPlayer.searchExact(event.GetLog().GetPlayer().GetName());
+		
 		if (player == null)
 			return;
 
 		if (player == killer)
 			return;
-
-		if ("Archery".equals(event.GetLog().GetLastDamager().GetLastDamageSource()))
+		
+		if (event.GetLog().GetLastDamager().GetLastDamageSource().contains("Archery"))
+		{
 			addStat(killer, "Sniper", 1, true, false);
+		}
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java
index 471cd5da0..2975b101b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ElectrocutionStatTracker.java
@@ -1,8 +1,15 @@
 package nautilus.game.arcade.stats;
 
-import mineplex.minecraft.game.classcombat.Skill.Mage.*;
-import nautilus.game.arcade.game.*;
-import org.bukkit.event.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import mineplex.minecraft.game.classcombat.Skill.Mage.LightningOrb.LightningOrbEvent;
+import nautilus.game.arcade.game.Game;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 
 public class ElectrocutionStatTracker extends StatTracker<Game>
 {
@@ -12,12 +19,24 @@ public class ElectrocutionStatTracker extends StatTracker<Game>
 	}
 
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-	public void onLightningOrb(LightningOrb.LightningOrbEvent event)
+	public void onLightningOrb(LightningOrbEvent event)
 	{
 		if (getGame().GetState() != Game.GameState.Live)
 			return;
-
-		if (event.getStruck().size() >= 4)
+		
+		List<Player> viable = new ArrayList<Player>();
+		
+		for (LivingEntity en : event.getStruck())
+		{
+			if (en instanceof Player)
+			{
+				viable.add((Player) en);
+			}
+		}
+		
+		if (viable.size() >= 4)
+		{
 			addStat(event.getPlayer(), "MassElectrocution", 1, true, false);
+		}
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java
index 901982794..10f9893b6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FirstSupplyDropOpenStatTracker.java
@@ -1,12 +1,18 @@
 package nautilus.game.arcade.stats;
 
-import nautilus.game.arcade.game.*;
-import nautilus.game.arcade.game.games.survivalgames.*;
-import org.bukkit.event.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import nautilus.game.arcade.game.Game;
+import nautilus.game.arcade.game.games.survivalgames.SupplyChestOpenEvent;
+
+import org.bukkit.block.Block;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 
 public class FirstSupplyDropOpenStatTracker extends StatTracker<Game>
 {
-	private boolean first = true;
+	private Set<Block> _opened = new HashSet<Block>();
 
 	public FirstSupplyDropOpenStatTracker(Game game)
 	{
@@ -19,11 +25,11 @@ public class FirstSupplyDropOpenStatTracker extends StatTracker<Game>
 		if (getGame().GetState() != Game.GameState.Live)
 			return;
 
-		if (first)
-		{
-			addStat(event.getPlayer(), "SupplyDropsOpened", 1, false, false);
+		if (_opened.contains(event.getChest()))
+			return;
+		
+		_opened.add(event.getChest());
 
-			first = false;
-		}
+		addStat(event.getPlayer(), "SupplyDropsOpened", 1, false, false);
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
index 8edaaac79..383c34993 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
@@ -18,7 +18,7 @@ public class TheLongestShotStatTracker extends StatTracker<Game>
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
 	public void onCombatDeath(CombatDeathEvent event)
 	{
-		if (getGame().GetState() != Game.GameState.Live)
+		if (!getGame().IsLive())
 			return;
 
 		if (event.GetLog().GetKiller() == null)
@@ -38,13 +38,16 @@ public class TheLongestShotStatTracker extends StatTracker<Game>
 			return;
 
 		Player player = UtilPlayer.searchExact(event.GetLog().GetPlayer().GetName());
-		if (player == null)
+		
+		if (player == null || !player.isOnline())
 			return;
 
-		if (event.GetLog().GetLastDamager().GetReason() != null && event.GetLog().GetLastDamager().GetReason().contains("Longshot"))
+		if (event.GetLog().GetLastDamager().GetReason() != null && event.GetLog().GetLastDamager().GetReason().toLowerCase().contains("Longshot"))
 		{
-			if (killer.getLocation().distanceSquared(player.getLocation()) >= 64 * 64)
+			if (killer.getLocation().distance(player.getLocation()) >= 64)
+			{
 				addStat(killer, "TheLongestShot", 1, false, false);
+			}
 		}
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
index 49b448e66..cb24d7b0b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
@@ -3,20 +3,19 @@ package nautilus.game.arcade.stats;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
 
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
 public class WinWithoutDyingStatTracker extends StatTracker<Game>
 {
-	private final Set<UUID> _hasDied = new HashSet<>();
+	private final Set<Player> _hasDied = new HashSet<Player>();
 	private final String _stat;
 
 	public WinWithoutDyingStatTracker(Game game, String stat)
@@ -29,7 +28,7 @@ public class WinWithoutDyingStatTracker extends StatTracker<Game>
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
 	public void onCombatDeath(CombatDeathEvent event)
 	{
-		if (getGame().GetState() != Game.GameState.Live)
+		if (!getGame().IsLive())
 			return;
 
 		if (event.GetLog().GetPlayer() == null)
@@ -39,13 +38,14 @@ public class WinWithoutDyingStatTracker extends StatTracker<Game>
 			return;
 
 		Player player = UtilPlayer.searchExact(event.GetLog().GetPlayer().GetName());
-		if (player == null)
+		if (player == null || !player.isOnline())
+		{
 			return;
-
-		_hasDied.add(player.getUniqueId());
+		}
+		_hasDied.add(player);
 	}
 
-	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onGameStateChange(GameStateChangeEvent event)
 	{
 		if (event.GetState() == Game.GameState.End)
@@ -56,8 +56,10 @@ public class WinWithoutDyingStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_hasDied.contains(winner.getUniqueId()))
-						addStat(winner, getStat(), 1, true, false);
+					if (!_hasDied.contains(winner))
+					{
+						addStat(winner, _stat, 1, true, false);
+					}
 				}
 			}
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
index 90d61b653..2f91d8f86 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
@@ -3,24 +3,22 @@ package nautilus.game.arcade.stats;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
+import mineplex.core.common.util.UtilEvent;
+import mineplex.core.common.util.UtilEvent.ActionType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
-import nautilus.game.arcade.game.games.skywars.events.PlayerOpenChestEvent;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 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.player.PlayerInteractEvent;
 
 public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 {
-
-	private final Set<UUID> _openChest = new HashSet<>();
+	private final Set<Player> _openChest = new HashSet<Player>();
 
 	public WinWithoutOpeningChestStatTracker(Game game)
 	{
@@ -28,14 +26,18 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 	}
 
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.HIGH)
 	public void onOpenChest(PlayerInteractEvent event) 
 	{
-		if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
+		if (event.isCancelled())
+		{
+			return;
+		}
+		if (UtilEvent.isAction(event, ActionType.R_BLOCK))
 		{
 			if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CHEST)
 			{
-				_openChest.add(event.getPlayer().getUniqueId());
+				_openChest.add(event.getPlayer());
 			}
 		}
 	}
@@ -44,10 +46,12 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 	public void onBreakChest(BlockBreakEvent event)
 	{
 		if (event.getBlock().getType() == Material.CHEST)
-			_openChest.add(event.getPlayer().getUniqueId());
+		{
+			_openChest.add(event.getPlayer());
+		}
 	}
 	
-	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onGameStateChange(GameStateChangeEvent event)
 	{
 		if (event.GetState() == Game.GameState.End)
@@ -58,8 +62,10 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_openChest.contains(winner.getUniqueId()))
+					if (!_openChest.contains(winner))
+					{
 						addStat(winner, "NoChest", 1, true, false);
+					}
 				}
 			}
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
index b6c850159..005743742 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
@@ -1,19 +1,23 @@
 package nautilus.game.arcade.stats;
 
-import mineplex.core.updater.*;
-import mineplex.core.updater.event.*;
-import nautilus.game.arcade.events.*;
-import nautilus.game.arcade.game.*;
-import org.bukkit.*;
-import org.bukkit.entity.*;
-import org.bukkit.event.*;
-import org.bukkit.inventory.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import java.util.*;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.Game;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.inventory.ItemStack;
 
 public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 {
-	private final Set<UUID> _armorWearers = new HashSet<>();
+	private final Set<Player> _wearing = new HashSet<Player>();
 
 	public WinWithoutWearingArmorStatTracker(Game game)
 	{
@@ -26,19 +30,20 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 		if (getGame().GetState() != Game.GameState.Live)
 			return;
 
-		if (event.getType() == UpdateType.FAST)
+		if (event.getType() == UpdateType.TICK)
 		{
 			for (Player player : getGame().GetPlayers(true))
 			{
-				if (_armorWearers.contains(player.getUniqueId()))
+				if (_wearing.contains(player))
+				{
 					continue;
+				}
 
 				for (ItemStack armor : player.getInventory().getArmorContents())
 				{
 					if (armor != null && armor.getType() != Material.AIR)
 					{
-						_armorWearers.add(player.getUniqueId());
-
+						_wearing.add(player);
 						break;
 					}
 				}
@@ -46,7 +51,7 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 		}
 	}
 
-	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR)
 	public void onGameStateChange(GameStateChangeEvent event)
 	{
 		if (event.GetState() == Game.GameState.End)
@@ -57,8 +62,10 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_armorWearers.contains(winner.getUniqueId()))
+					if (!_wearing.contains(winner))
+					{
 						addStat(winner, "NoArmor", 1, true, false);
+					}
 				}
 			}
 		}

From bb769aa0f43471fdaa4fa1c75e17c9e5d6306c48 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 10:02:50 -0400
Subject: [PATCH 18/70] I'm a dumbass

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

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
index 383c34993..d22e2e515 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TheLongestShotStatTracker.java
@@ -42,7 +42,7 @@ public class TheLongestShotStatTracker extends StatTracker<Game>
 		if (player == null || !player.isOnline())
 			return;
 
-		if (event.GetLog().GetLastDamager().GetReason() != null && event.GetLog().GetLastDamager().GetReason().toLowerCase().contains("Longshot"))
+		if (event.GetLog().GetLastDamager().GetReason() != null && event.GetLog().GetLastDamager().GetReason().toLowerCase().contains("longshot"))
 		{
 			if (killer.getLocation().distance(player.getLocation()) >= 64)
 			{

From 63df369700fee872cf18f18ffa5bc344625e878f Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 10:18:50 -0400
Subject: [PATCH 19/70] Cleaned up somethings (lib's request)

---
 .../nautilus/game/arcade/game/games/skywars/Skywars.java  | 5 +----
 .../game/arcade/stats/WinWithoutDyingStatTracker.java     | 6 +++---
 .../arcade/stats/WinWithoutOpeningChestStatTracker.java   | 8 ++++----
 .../arcade/stats/WinWithoutWearingArmorStatTracker.java   | 8 ++++----
 4 files changed, 12 insertions(+), 15 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 c64af6eaa..c6a2003e9 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,7 +6,6 @@ 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;
@@ -25,7 +24,6 @@ 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;
@@ -43,8 +41,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.KitMiner;
 import nautilus.game.arcade.game.games.skywars.kits.KitMadScientist;
+import nautilus.game.arcade.game.games.skywars.kits.KitMiner;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.ore.OreHider;
 import nautilus.game.arcade.stats.DeathBomberStatTracker;
@@ -67,7 +65,6 @@ 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;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
index cb24d7b0b..5f9f990f6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutDyingStatTracker.java
@@ -15,7 +15,7 @@ import org.bukkit.event.EventPriority;
 
 public class WinWithoutDyingStatTracker extends StatTracker<Game>
 {
-	private final Set<Player> _hasDied = new HashSet<Player>();
+	private final Set<String> _hasDied = new HashSet<String>();
 	private final String _stat;
 
 	public WinWithoutDyingStatTracker(Game game, String stat)
@@ -42,7 +42,7 @@ public class WinWithoutDyingStatTracker extends StatTracker<Game>
 		{
 			return;
 		}
-		_hasDied.add(player);
+		_hasDied.add(player.getUniqueId().toString());
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
@@ -56,7 +56,7 @@ public class WinWithoutDyingStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_hasDied.contains(winner))
+					if (!_hasDied.contains(winner.getUniqueId().toString()))
 					{
 						addStat(winner, _stat, 1, true, false);
 					}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
index 2f91d8f86..3a9459092 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
@@ -18,7 +18,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
 
 public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 {
-	private final Set<Player> _openChest = new HashSet<Player>();
+	private final Set<String> _openChest = new HashSet<String>();
 
 	public WinWithoutOpeningChestStatTracker(Game game)
 	{
@@ -37,7 +37,7 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 		{
 			if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CHEST)
 			{
-				_openChest.add(event.getPlayer());
+				_openChest.add(event.getPlayer().getUniqueId().toString());
 			}
 		}
 	}
@@ -47,7 +47,7 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 	{
 		if (event.getBlock().getType() == Material.CHEST)
 		{
-			_openChest.add(event.getPlayer());
+			_openChest.add(event.getPlayer().getUniqueId().toString());
 		}
 	}
 	
@@ -62,7 +62,7 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_openChest.contains(winner))
+					if (!_openChest.contains(winner.getUniqueId().toString()))
 					{
 						addStat(winner, "NoChest", 1, true, false);
 					}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
index 005743742..5f2626d06 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutWearingArmorStatTracker.java
@@ -17,7 +17,7 @@ import org.bukkit.inventory.ItemStack;
 
 public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 {
-	private final Set<Player> _wearing = new HashSet<Player>();
+	private final Set<String> _wearing = new HashSet<String>();
 
 	public WinWithoutWearingArmorStatTracker(Game game)
 	{
@@ -34,7 +34,7 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 		{
 			for (Player player : getGame().GetPlayers(true))
 			{
-				if (_wearing.contains(player))
+				if (_wearing.contains(player.getUniqueId().toString()))
 				{
 					continue;
 				}
@@ -43,7 +43,7 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 				{
 					if (armor != null && armor.getType() != Material.AIR)
 					{
-						_wearing.add(player);
+						_wearing.add(player.getUniqueId().toString());
 						break;
 					}
 				}
@@ -62,7 +62,7 @@ public class WinWithoutWearingArmorStatTracker extends StatTracker<Game>
 			{
 				for (Player winner : winners)
 				{
-					if (!_wearing.contains(winner))
+					if (!_wearing.contains(winner.getUniqueId().toString()))
 					{
 						addStat(winner, "NoArmor", 1, true, false);
 					}

From 6addf00037a35cba3aa60189d14716362f899498 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 14:27:10 -0400
Subject: [PATCH 20/70] LOTS of tweaks :D

---
 .../src/mineplex/core/common/Rank.java        |  2 +-
 .../core/account/command/UpdateRank.java      |  2 +-
 .../core/achievement/AchievementCategory.java | 26 ++++----
 .../src/mineplex/core/chat/Chat.java          |  4 +-
 .../mineplex/core/friend/FriendManager.java   |  2 +-
 .../mineplex/core/ignore/IgnoreManager.java   |  2 +-
 .../mineplex/core/message/MessageManager.java |  8 +--
 .../core/message/commands/AdminCommand.java   |  2 +-
 .../message/commands/MessageAdminCommand.java |  2 +-
 .../message/commands/ResendAdminCommand.java  |  2 +-
 .../core/portal/Commands/ServerCommand.java   |  2 +-
 .../core/punish/Command/PunishCommand.java    |  2 +-
 .../src/mineplex/core/punish/Punish.java      |  2 +-
 .../serverConfig/ServerConfiguration.java     |  2 +-
 .../src/mineplex/hub/HubManager.java          |  6 +-
 .../classcombat/Skill/Brute/BlockToss.java    |  4 +-
 .../classcombat/shop/ClassShopManager.java    |  2 +-
 .../nautilus/game/arcade/ArcadeManager.java   |  2 +-
 .../game/games/turfforts/TurfForts.java       | 63 +++++++++++--------
 .../arcade/game/games/wither/WitherGame.java  | 48 +++++++-------
 .../arcade/kit/perks/PerkSeismicSlam.java     | 46 +++++++++-----
 .../game/arcade/kit/perks/PerkZombieBile.java | 38 +++++++----
 .../game/arcade/managers/GameHostManager.java |  1 +
 23 files changed, 154 insertions(+), 116 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 47719668a..1639d49a8 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
@@ -15,7 +15,7 @@ public enum Rank
 	SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
 	MODERATOR("Mod", ChatColor.GOLD),
 	JNR_DEV("Jr.Dev", ChatColor.RED),
-	HELPER("Trainee", ChatColor.DARK_AQUA),
+	TRAINEE("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..56d65a52e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
@@ -52,7 +52,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 (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.TRAINEE || 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/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
index d777224ac..af4c16c20 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
@@ -16,7 +16,7 @@ public enum AchievementCategory
 {
 	GLOBAL("Global", null,
 			new StatDisplay[] { StatDisplay.GEMS_EARNED, null, new StatDisplay("Games Played", "GamesPlayed"), StatDisplay.TIME_IN_GAME },
-			Material.EMERALD, 0, GameCategory.GLOBAL, null),
+			Material.EMERALD, 0, GameCategory.GLOBAL, "None"),
 
 	BRIDGES("The Bridges", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -32,11 +32,11 @@ public enum AchievementCategory
 
 	UHC("Ultra Hardcore", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
+			Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "None"),
 
 	WIZARDS("Wizards", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
+			Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Witch Doctor Kit"),
 
 	CASTLE_SIEGE("Castle Siege", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"),
@@ -45,7 +45,7 @@ public enum AchievementCategory
 
 	BLOCK_HUNT("Block Hunt", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.GRASS, 0, GameCategory.CLASSICS, null),
+			Material.GRASS, 0, GameCategory.CLASSICS, "Infestor Kit"),
 
 	SMASH_MOBS("Super Smash Mobs", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -53,11 +53,11 @@ public enum AchievementCategory
 
 	MINE_STRIKE("MineStrike", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.TNT, 0, GameCategory.CLASSICS, null),
+			Material.TNT, 0, GameCategory.CLASSICS, "None"),
 
 	DRAW_MY_THING("Draw My Thing", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
-			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, null),
+			Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "Extra Tools Kit"),
 
 	CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM"},
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -65,7 +65,7 @@ public enum AchievementCategory
 
 	MASTER_BUILDERS("Master Builders", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
-			Material.WOOD, 0, GameCategory.CLASSICS, null),
+			Material.WOOD, 0, GameCategory.CLASSICS, "None"),
 			
 	//Arcade
 	DRAGONS("Dragons", null,
@@ -74,7 +74,7 @@ public enum AchievementCategory
 	
 	DRAGON_ESCAPE("Dragon Escape", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
-			Material.DRAGON_EGG, 0, GameCategory.ARCADE, null),
+			Material.DRAGON_EGG, 0, GameCategory.ARCADE, "Digger Kit"),
 	
 	SHEEP_QUEST("Sheep Quest", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -82,11 +82,11 @@ public enum AchievementCategory
 	
 	SNEAKY_ASSASSINS("Sneaky Assassins", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.INK_SACK, 0, GameCategory.ARCADE, null),
+			Material.INK_SACK, 0, GameCategory.ARCADE, "Briber Kit"),
 	
 	ONE_IN_THE_QUIVER("One in the Quiver", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.BOW, 0, GameCategory.ARCADE, null),
+			Material.BOW, 0, GameCategory.ARCADE, "Slam Shooter Kit"),
 	
 	SUPER_PAINTBALL("Super Paintball", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@@ -97,11 +97,11 @@ public enum AchievementCategory
 			Material.HARD_CLAY, 14, GameCategory.ARCADE, null),
 	
 	RUNNER("Runner", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.LEATHER_BOOTS, 0, GameCategory.ARCADE, null),
 	
 	SPLEEF("Super Spleef", null,
-			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
+			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
 			Material.IRON_SPADE, 0, GameCategory.ARCADE, null),
 	
 	DEATH_TAG("Death Tag", null,
@@ -110,7 +110,7 @@ public enum AchievementCategory
 			
 	SNAKE("Snake", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.WOOL, 4, GameCategory.ARCADE, null),
+			Material.WOOL, 4, GameCategory.ARCADE, "Reversal Snake Kit"),
 			
 	BACON_BRAWL("Bacon Brawl", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index eaa6f0e2e..1c32b56a8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -323,7 +323,7 @@ public class Chat extends MiniPlugin
 			UtilPlayer.message(sender, F.main("Chat", "You are sending messages too fast."));
 			event.setCancelled(true);
 		}
-		else if (!_clientManager.Get(sender).GetRank().Has(Rank.HELPER) &&
+		else if (!_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE) &&
 				msgContainsHack(event.getMessage()))
 		{
 			UtilPlayer.message(sender, F.main("Chat", 
@@ -337,7 +337,7 @@ public class Chat extends MiniPlugin
 			MessageData lastMessage = _playerLastMessage.get(sender.getUniqueId());
 			long chatSlowTime = 1000L * _chatSlow;
 			long timeDiff = System.currentTimeMillis() - lastMessage.getTimeSent();
-			if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.HELPER))
+			if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE))
 			{
 				UtilPlayer.message(sender, F.main("Chat", "Chat slow enabled. Please wait " + F.time(UtilTime.convertString(chatSlowTime - timeDiff, 1, UtilTime.TimeUnit.FIT))));
 				event.setCancelled(true);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
index c25fec865..bf0a5d16a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
@@ -251,7 +251,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
 
     public void showFriends(Player caller)
     {
-        boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.HELPER);
+        boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.TRAINEE);
         boolean gotAFriend = false;
         List<FriendStatus> friendStatuses = Get(caller).getFriends();
         Collections.sort(friendStatuses, _friendSorter);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
index 7edaa801f..35d3f95b5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
@@ -88,7 +88,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
     @EventHandler
     public void onChat(AsyncPlayerChatEvent event)
     {
-        if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.HELPER))
+        if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.TRAINEE))
             return;
 
         Iterator<Player> itel = event.getRecipients().iterator();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
index b81e7fbb1..c7eac5639 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
@@ -191,7 +191,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 
 		// My attempt at trying to mitigate some of the spam bots - Phinary
 		// Triggers if they are whispering a new player
-		if (!GetClientManager().Get(from).GetRank().Has(Rank.HELPER) && Get(from).LastTo != null
+		if (!GetClientManager().Get(from).GetRank().Has(Rank.TRAINEE) && Get(from).LastTo != null
 				&& !Get(from).LastTo.equalsIgnoreCase(to.getName()))
 		{
 			long delta = System.currentTimeMillis() - Get(from).LastToTime;
@@ -247,7 +247,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 		{
 			if (!to.equals(staff) && !from.equals(staff))
 			{
-				if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
+				if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
 				{
 					UtilPlayer.message(staff, F.rank(_clientManager.Get(from).GetRank()) + " " + from.getName() + C.cPurple
 							+ " -> " + F.rank(_clientManager.Get(to).GetRank()) + " " + to.getName() + " " + C.cPurple + message);
@@ -364,7 +364,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 			{
 				if (!to.equals(staff))
 				{
-					if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
+					if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
 					{
 						UtilPlayer.message(staff,
 
@@ -442,7 +442,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 				{
 					if (!target.equals(staff))
 					{
-						if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
+						if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
 						{
 							UtilPlayer.message(staff,
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
index 8534424dc..375cd623a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
@@ -48,7 +48,7 @@ public class AdminCommand extends CommandBase<MessageManager>
 			boolean staff = false;
 			for (Player to : UtilServer.getPlayers())
 			{
-				if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.HELPER))
+				if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.TRAINEE))
 				{
 					if (!to.equals(caller))
 						UtilPlayer.message(to, F.rank(Plugin.GetClientManager().Get(caller).GetRank()) + " " + caller.getName() + " " + C.cPurple + message);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
index 89a459c36..6534614dd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
@@ -24,7 +24,7 @@ public class MessageAdminCommand extends CommandBase<MessageManager>
         }
         else
         {
-            if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
+            if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true))
                 return;
 
             if (args.length == 0)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
index a1a4f21c3..4f46d6c48 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
@@ -24,7 +24,7 @@ public class ResendAdminCommand extends CommandBase<MessageManager>
 		}
 		else
 		{
-			if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
+			if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true))
 				return;
 
             String lastTo = Plugin.Get(caller).LastAdminTo;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
index 37d5d933c..53557ba79 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
@@ -72,7 +72,7 @@ public class ServerCommand extends CommandBase<Portal>
 						}
 						else if (servUp.contains("STAFF"))
 						{
-							if (playerRank.Has(Rank.HELPER))
+							if (playerRank.Has(Rank.TRAINEE))
 								Plugin.sendPlayerToServer(player, args[0]);
 							else
 								deniedAccess = true;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
index b578a2566..347d4024e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
@@ -19,7 +19,7 @@ public class PunishCommand extends CommandBase<Punish>
 {
 	public PunishCommand(Punish plugin)
 	{
-		super(plugin, Rank.HELPER, "punish", "p");
+		super(plugin, Rank.TRAINEE, "punish", "p");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
index adaceb736..74663cd37 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
@@ -214,7 +214,7 @@ public class Punish extends MiniPlugin
 	{
 		for (Player player : UtilServer.getPlayers())
 		{
-			if (_clientManager.Get(player).GetRank().Has(Rank.HELPER) || player.getName().equals(punishee))
+			if (_clientManager.Get(player).GetRank().Has(Rank.TRAINEE) || player.getName().equals(punishee))
 			{
 				player.sendMessage(msg);
 			}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
index 02cc887b0..77743b88d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
@@ -56,7 +56,7 @@ public class ServerConfiguration extends MiniPlugin
 	@EventHandler
 	public void onPlayerLogin(PlayerLoginEvent event)
 	{
-		if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
+		if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.TRAINEE, false))
 			event.disallow(Result.KICK_OTHER, "This is a staff only server.");
 	}
 	
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 33dd7047d..548f9fb04 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -318,7 +318,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 				+ "§r\n"
 				+ "§lHow do I apply for Trainee?\n"
 				+ "\n"
-				+ "§rYou may only apply for Helper if you have §bUltra§0, §5Hero§0, or §aLegend§0.\n"
+				+ "§rYou may only apply for Trainee if you have §bUltra§0, §5Hero§0, or §aLegend§0.\n"
 				+ "Apply at:\n"
 				+ "§omineplex.com/application\n");
 
@@ -620,7 +620,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 	public void playerPrivateMessage(PrivateMessageEvent event)
 	{
 		//Dont Let PM Near Spawn!
-		if (UtilMath.offset2d(GetSpawn(), event.getSender().getLocation()) == 0 && !_clientManager.Get(event.getSender()).GetRank().Has(Rank.HELPER))
+		if (UtilMath.offset2d(GetSpawn(), event.getSender().getLocation()) == 0 && !_clientManager.Get(event.getSender()).GetRank().Has(Rank.TRAINEE))
 		{
 			UtilPlayer.message(event.getSender(), F.main("Chat", "You must leave spawn before you can Private Message!"));
 			event.setCancelled(true);
@@ -634,7 +634,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 			return;
 		
 		//Dont Let Chat Near Spawn!
-		if (UtilMath.offset2d(GetSpawn(), event.getPlayer().getLocation()) == 0 && !_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.HELPER))
+		if (UtilMath.offset2d(GetSpawn(), event.getPlayer().getLocation()) == 0 && !_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.TRAINEE))
 		{
 			UtilPlayer.message(event.getPlayer(), F.main("Chat", "You must leave spawn before you can chat!"));
 			event.setCancelled(true);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
index 9bf9994fc..524bdce6c 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
@@ -130,7 +130,7 @@ public class BlockToss extends SkillCharge implements IThrown
 		}
 
 		//Block to Item
-		FallingBlock block  = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), (byte)0);
+		FallingBlock block  = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), event.getClickedBlock().getData());
 
 		//Action
 		player.eject();
@@ -235,7 +235,7 @@ public class BlockToss extends SkillCharge implements IThrown
 		{
 			FallingBlock thrown = (FallingBlock) data.GetThrown();
 
-			FallingBlock newThrown  = data.GetThrown().getWorld().spawnFallingBlock(data.GetThrown().getLocation(), thrown.getMaterial(), (byte)0);
+			FallingBlock newThrown  = data.GetThrown().getWorld().spawnFallingBlock(data.GetThrown().getLocation(), thrown.getMaterial(), thrown.getBlockData());
 
 			//Remove Old
 			_falling.remove(thrown);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
index 5a333c782..5643076e5 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
@@ -48,7 +48,7 @@ public class ClassShopManager extends MiniPlugin
 	
 	public boolean hasAchievements(Player player)
 	{
-		if (_clientManager.Get(player).GetRank().Has(Rank.HELPER))
+		if (_clientManager.Get(player).GetRank().Has(Rank.TRAINEE))
 			return true;
 		
 		return _achievementManager.hasCategory(player, new Achievement[] 
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..c9e389be1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -797,7 +797,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		// Reserved Slot Check
 		if (Bukkit.getOnlinePlayers().size() >= Bukkit.getServer().getMaxPlayers())
 		{
-			if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
+			if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.TRAINEE, false))
 			{
 				event.allow();
 				event.setResult(PlayerLoginEvent.Result.ALLOWED);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
index a4c514cb3..7b4477a05 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
@@ -4,33 +4,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-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.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityShootBowEvent;
-import org.bukkit.event.entity.ItemSpawnEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-
-import net.minecraft.server.v1_7_R4.EntityArrow;
-import net.minecraft.server.v1_7_R4.Item;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.MapUtil;
@@ -57,6 +30,32 @@ import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.stats.BehindEnemyLinesStatTracker;
 import nautilus.game.arcade.stats.BlockShreadStatTracker;
 import nautilus.game.arcade.stats.TheComebackStatTracker;
+import net.minecraft.server.v1_7_R4.EntityArrow;
+
+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.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
 
 public class TurfForts extends TeamGame
 {
@@ -328,6 +327,16 @@ public class TurfForts extends TeamGame
 		}
 		
 	}
+	
+	@EventHandler(priority = EventPriority.HIGH)
+	public void BlockBreak(BlockBreakEvent event)
+	{
+		if (!IsAlive(event.getPlayer()))
+		{
+			event.setCancelled(true);
+			return;
+		}
+	}
 
 	@EventHandler
 	public void BlockDamage(ProjectileHitEvent event)
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..634e27970 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
@@ -6,24 +6,6 @@ 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;
@@ -43,14 +25,32 @@ 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.kit.KitHumanArcher;
+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 org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.EntityEffect;
+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;
+
 public class WitherGame extends TeamGame implements IBlockRestorer
 {
 	private GameTeam _runners;
@@ -110,13 +110,7 @@ public class WitherGame extends TeamGame implements IBlockRestorer
 		this.KitRegisterState = GameState.Prepare;
 		
 		this.TeamArmor = true;
-		this.TeamArmorHotbar = false;
-		
-		_help = new String[]  
-				{ 
-				C.cRed + C.Bold + "This game is still under development!",
-				  
-				};  
+		this.TeamArmorHotbar = false; 
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java
index 9309e6cf4..f3ee858f5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java
@@ -2,6 +2,19 @@ package nautilus.game.arcade.kit.perks;
 
 import java.util.HashMap;
 
+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;
+import mineplex.core.common.util.UtilTime;
+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;
+
 import org.bukkit.Effect;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -11,23 +24,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.PlayerDeathEvent;
 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.UtilPlayer;
-import mineplex.core.common.util.UtilTime;
-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 PerkSeismicSlam extends Perk
 {	
 	private HashMap<LivingEntity, Long> _live = new HashMap<LivingEntity, Long>();
@@ -39,6 +39,21 @@ public class PerkSeismicSlam extends Perk
 				C.cYellow + "Right-Click" + C.cGray + " with Spade to " + C.cGreen + "Seismic Slam"
 				});
 	}
+	
+	@EventHandler
+	public void deactivateDeath(PlayerDeathEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		if (!Kit.HasKit(event.getEntity()))
+			return;
+		
+		if (_live.containsKey(event.getEntity()))
+		{
+			_live.remove(event.getEntity());
+		}
+	}
 
 	@EventHandler
 	public void Leap(PlayerInteractEvent event)
@@ -109,6 +124,9 @@ public class PerkSeismicSlam extends Perk
 				if (cur.equals(player))
 					continue;
 
+				if (cur instanceof Player && !Manager.IsAlive((Player) cur))
+					continue;
+				
 				//Damage Event
 				Manager.GetDamage().NewDamageEvent(cur, player, null, 
 						DamageCause.CUSTOM, damage * targets.get(cur) + 0.5, true, true, false,
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieBile.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieBile.java
index 47835d469..57ef2dc4d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieBile.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkZombieBile.java
@@ -3,17 +3,6 @@ package nautilus.game.arcade.kit.perks;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-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;
@@ -30,6 +19,18 @@ import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.kit.SmashPerk;
 
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.util.Vector;
+
 public class PerkZombieBile extends SmashPerk implements IThrown
 {
 	private HashMap<Player, Long> _active = new HashMap<Player, Long>();
@@ -70,6 +71,21 @@ public class PerkZombieBile extends SmashPerk implements IThrown
 		UtilPlayer.message(player, F.main("Skill", "You used " + F.skill(GetName()) + "."));
 	}
 	
+	@EventHandler
+	public void deactivateDeath(PlayerDeathEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		if (!Kit.HasKit(event.getEntity()))
+			return;
+		
+		if (_active.containsKey(event.getEntity()))
+		{
+			_active.remove(event.getEntity());
+		}
+	}
+	
 	@EventHandler
 	public void update(UpdateEvent event)  
 	{
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..c7ac57ff5 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
@@ -308,6 +308,7 @@ public class GameHostManager implements Listener
 		if (!event.getMessage().toLowerCase().startsWith("/menu"))
 			return;
 		
+		event.setCancelled(true);
 		openMenu(event.getPlayer());
 	}
 	

From e55ca81d480ff5aabc4478be3b362703a2268c1e Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 15:45:16 -0400
Subject: [PATCH 21/70] Reverted Trainee to Helper due to popular demand.

---
 .../src/mineplex/core/account/command/UpdateRank.java     | 2 +-
 Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java    | 4 ++--
 .../src/mineplex/core/friend/FriendManager.java           | 2 +-
 .../src/mineplex/core/gadget/gadgets/BlockForm.java       | 2 +-
 .../src/mineplex/core/ignore/IgnoreManager.java           | 2 +-
 .../src/mineplex/core/message/MessageManager.java         | 8 ++++----
 .../src/mineplex/core/message/commands/AdminCommand.java  | 2 +-
 .../core/message/commands/MessageAdminCommand.java        | 2 +-
 .../core/message/commands/ResendAdminCommand.java         | 2 +-
 .../src/mineplex/core/portal/Commands/ServerCommand.java  | 2 +-
 .../src/mineplex/core/punish/Command/PunishCommand.java   | 2 +-
 .../Mineplex.Core/src/mineplex/core/punish/Punish.java    | 2 +-
 .../mineplex/core/serverConfig/ServerConfiguration.java   | 2 +-
 13 files changed, 17 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 56d65a52e..8a7efe8fe 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
@@ -52,7 +52,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.TRAINEE || 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)
 			{
 				if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT))
 				{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index 1c32b56a8..eaa6f0e2e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -323,7 +323,7 @@ public class Chat extends MiniPlugin
 			UtilPlayer.message(sender, F.main("Chat", "You are sending messages too fast."));
 			event.setCancelled(true);
 		}
-		else if (!_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE) &&
+		else if (!_clientManager.Get(sender).GetRank().Has(Rank.HELPER) &&
 				msgContainsHack(event.getMessage()))
 		{
 			UtilPlayer.message(sender, F.main("Chat", 
@@ -337,7 +337,7 @@ public class Chat extends MiniPlugin
 			MessageData lastMessage = _playerLastMessage.get(sender.getUniqueId());
 			long chatSlowTime = 1000L * _chatSlow;
 			long timeDiff = System.currentTimeMillis() - lastMessage.getTimeSent();
-			if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.TRAINEE))
+			if (timeDiff < chatSlowTime && !_clientManager.Get(sender).GetRank().Has(Rank.HELPER))
 			{
 				UtilPlayer.message(sender, F.main("Chat", "Chat slow enabled. Please wait " + F.time(UtilTime.convertString(chatSlowTime - timeDiff, 1, UtilTime.TimeUnit.FIT))));
 				event.setCancelled(true);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
index bf0a5d16a..c25fec865 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
@@ -251,7 +251,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
 
     public void showFriends(Player caller)
     {
-        boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.TRAINEE);
+        boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.HELPER);
         boolean gotAFriend = false;
         List<FriendStatus> friendStatuses = Get(caller).getFriends();
         Collections.sort(friendStatuses, _friendSorter);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
index 6635ddbe3..c5d37b9c5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
@@ -3,7 +3,6 @@ package mineplex.core.gadget.gadgets;
 import java.util.ArrayList;
 import java.util.List;
 
-import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.MapUtil;
 import mineplex.core.common.util.UtilBlock;
@@ -64,6 +63,7 @@ public class BlockForm
 		DisguiseChicken disguise = new DisguiseChicken(_player);
 		disguise.setBaby(); 
 		disguise.setSoundDisguise(new DisguiseCat(_player));
+		disguise.setInvisible(true);
 		_host.Manager.getDisguiseManager().disguise(disguise);
 
 		//Apply Falling Block
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
index 35d3f95b5..7edaa801f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
@@ -88,7 +88,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
     @EventHandler
     public void onChat(AsyncPlayerChatEvent event)
     {
-        if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.TRAINEE))
+        if (ClientManager.Get(event.getPlayer()).GetRank().Has(Rank.HELPER))
             return;
 
         Iterator<Player> itel = event.getRecipients().iterator();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
index c7eac5639..b81e7fbb1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
@@ -191,7 +191,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 
 		// My attempt at trying to mitigate some of the spam bots - Phinary
 		// Triggers if they are whispering a new player
-		if (!GetClientManager().Get(from).GetRank().Has(Rank.TRAINEE) && Get(from).LastTo != null
+		if (!GetClientManager().Get(from).GetRank().Has(Rank.HELPER) && Get(from).LastTo != null
 				&& !Get(from).LastTo.equalsIgnoreCase(to.getName()))
 		{
 			long delta = System.currentTimeMillis() - Get(from).LastToTime;
@@ -247,7 +247,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 		{
 			if (!to.equals(staff) && !from.equals(staff))
 			{
-				if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
+				if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
 				{
 					UtilPlayer.message(staff, F.rank(_clientManager.Get(from).GetRank()) + " " + from.getName() + C.cPurple
 							+ " -> " + F.rank(_clientManager.Get(to).GetRank()) + " " + to.getName() + " " + C.cPurple + message);
@@ -364,7 +364,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 			{
 				if (!to.equals(staff))
 				{
-					if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
+					if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
 					{
 						UtilPlayer.message(staff,
 
@@ -442,7 +442,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
 				{
 					if (!target.equals(staff))
 					{
-						if (_clientManager.Get(staff).GetRank().Has(Rank.TRAINEE))
+						if (_clientManager.Get(staff).GetRank().Has(Rank.HELPER))
 						{
 							UtilPlayer.message(staff,
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
index 375cd623a..8534424dc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java
@@ -48,7 +48,7 @@ public class AdminCommand extends CommandBase<MessageManager>
 			boolean staff = false;
 			for (Player to : UtilServer.getPlayers())
 			{
-				if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.TRAINEE))
+				if (Plugin.GetClientManager().Get(to).GetRank().Has(Rank.HELPER))
 				{
 					if (!to.equals(caller))
 						UtilPlayer.message(to, F.rank(Plugin.GetClientManager().Get(caller).GetRank()) + " " + caller.getName() + " " + C.cPurple + message);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
index 6534614dd..89a459c36 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java
@@ -24,7 +24,7 @@ public class MessageAdminCommand extends CommandBase<MessageManager>
         }
         else
         {
-            if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true))
+            if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
                 return;
 
             if (args.length == 0)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
index 4f46d6c48..a1a4f21c3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java
@@ -24,7 +24,7 @@ public class ResendAdminCommand extends CommandBase<MessageManager>
 		}
 		else
 		{
-			if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.TRAINEE, true))
+			if (!Plugin.GetClientManager().Get(caller).GetRank().Has(caller, Rank.HELPER, true))
 				return;
 
             String lastTo = Plugin.Get(caller).LastAdminTo;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
index 53557ba79..37d5d933c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
@@ -72,7 +72,7 @@ public class ServerCommand extends CommandBase<Portal>
 						}
 						else if (servUp.contains("STAFF"))
 						{
-							if (playerRank.Has(Rank.TRAINEE))
+							if (playerRank.Has(Rank.HELPER))
 								Plugin.sendPlayerToServer(player, args[0]);
 							else
 								deniedAccess = true;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
index 347d4024e..b578a2566 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Command/PunishCommand.java
@@ -19,7 +19,7 @@ public class PunishCommand extends CommandBase<Punish>
 {
 	public PunishCommand(Punish plugin)
 	{
-		super(plugin, Rank.TRAINEE, "punish", "p");
+		super(plugin, Rank.HELPER, "punish", "p");
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
index 74663cd37..adaceb736 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
@@ -214,7 +214,7 @@ public class Punish extends MiniPlugin
 	{
 		for (Player player : UtilServer.getPlayers())
 		{
-			if (_clientManager.Get(player).GetRank().Has(Rank.TRAINEE) || player.getName().equals(punishee))
+			if (_clientManager.Get(player).GetRank().Has(Rank.HELPER) || player.getName().equals(punishee))
 			{
 				player.sendMessage(msg);
 			}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
index 77743b88d..02cc887b0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
@@ -56,7 +56,7 @@ public class ServerConfiguration extends MiniPlugin
 	@EventHandler
 	public void onPlayerLogin(PlayerLoginEvent event)
 	{
-		if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.TRAINEE, false))
+		if (_serverGroup.getStaffOnly() && !_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
 			event.disallow(Result.KICK_OTHER, "This is a staff only server.");
 	}
 	

From d38fc1a603aa99cd6194a0844b966b5f92b5bdcc Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Mon, 20 Jul 2015 16:40:37 -0400
Subject: [PATCH 22/70] Reverted things

---
 .../Mineplex.Core.Common/src/mineplex/core/common/Rank.java   | 4 ++--
 Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java         | 4 ++--
 .../minecraft/game/classcombat/shop/ClassShopManager.java     | 2 +-
 .../src/nautilus/game/arcade/ArcadeManager.java               | 2 +-
 4 files changed, 6 insertions(+), 6 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 1639d49a8..1c769e523 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
@@ -15,7 +15,7 @@ public enum Rank
 	SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
 	MODERATOR("Mod", ChatColor.GOLD),
 	JNR_DEV("Jr.Dev", ChatColor.RED),
-	TRAINEE("Trainee", ChatColor.DARK_AQUA),
+	HELPER("Trainee", ChatColor.DARK_AQUA),
 	MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
 	MAPDEV("Builder", ChatColor.BLUE),
 	
@@ -75,7 +75,7 @@ public enum Rank
 		{
 			UtilPlayer.message(player, C.mHead + "Permissions> " + 
 					C.mBody + "This requires Permission Rank [" + 
-					C.mHead + rank +
+					C.mHead + rank.Name.toUpperCase() +
 					C.mBody + "].");
 		}
 		
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 548f9fb04..2e1dbc813 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -620,7 +620,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 	public void playerPrivateMessage(PrivateMessageEvent event)
 	{
 		//Dont Let PM Near Spawn!
-		if (UtilMath.offset2d(GetSpawn(), event.getSender().getLocation()) == 0 && !_clientManager.Get(event.getSender()).GetRank().Has(Rank.TRAINEE))
+		if (UtilMath.offset2d(GetSpawn(), event.getSender().getLocation()) == 0 && !_clientManager.Get(event.getSender()).GetRank().Has(Rank.HELPER))
 		{
 			UtilPlayer.message(event.getSender(), F.main("Chat", "You must leave spawn before you can Private Message!"));
 			event.setCancelled(true);
@@ -634,7 +634,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 			return;
 		
 		//Dont Let Chat Near Spawn!
-		if (UtilMath.offset2d(GetSpawn(), event.getPlayer().getLocation()) == 0 && !_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.TRAINEE))
+		if (UtilMath.offset2d(GetSpawn(), event.getPlayer().getLocation()) == 0 && !_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.HELPER))
 		{
 			UtilPlayer.message(event.getPlayer(), F.main("Chat", "You must leave spawn before you can chat!"));
 			event.setCancelled(true);
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
index 5643076e5..5a333c782 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java
@@ -48,7 +48,7 @@ public class ClassShopManager extends MiniPlugin
 	
 	public boolean hasAchievements(Player player)
 	{
-		if (_clientManager.Get(player).GetRank().Has(Rank.TRAINEE))
+		if (_clientManager.Get(player).GetRank().Has(Rank.HELPER))
 			return true;
 		
 		return _achievementManager.hasCategory(player, new Achievement[] 
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 c9e389be1..7e8b5243e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -797,7 +797,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		// Reserved Slot Check
 		if (Bukkit.getOnlinePlayers().size() >= Bukkit.getServer().getMaxPlayers())
 		{
-			if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.TRAINEE, false))
+			if (_clientManager.Get(event.getPlayer().getName()).GetRank().Has(event.getPlayer(), Rank.HELPER, false))
 			{
 				event.allow();
 				event.setResult(PlayerLoginEvent.Result.ALLOWED);

From b4df9f47c55702db6c6c94d61622efef3fec5d13 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Tue, 21 Jul 2015 11:01:45 -0400
Subject: [PATCH 23/70] Added a mortar kit ;o (Please don't fire me b2)

---
 .../game/games/lobbers/BombLobbers.java       | 101 ++++++++++-----
 .../lobbers/events/TNTPreExplodeEvent.java    |  52 ++++++++
 .../game/games/lobbers/kits/KitMortar.java    |  36 ++++++
 .../lobbers/kits/perks/PerkCraftman.java      |   2 +-
 .../games/lobbers/kits/perks/PerkMortar.java  | 116 ++++++++++++++++++
 .../kits/perks/PerkMorterCraftman.java        |  55 +++++++++
 6 files changed, 332 insertions(+), 30 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTPreExplodeEvent.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitMortar.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMorterCraftman.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 4452e6ddf..fd518af67 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
@@ -8,6 +8,7 @@ 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.UtilEnt;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilParticle.ParticleType;
@@ -26,10 +27,12 @@ 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.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.KitDetonator;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
+import nautilus.game.arcade.game.games.lobbers.kits.KitMortar;
 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;
@@ -57,8 +60,7 @@ public class BombLobbers extends TeamGame implements IThrown
 {
 	private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
 	
-	private NautHashMap<TNTPrimed, String> _throwers = new NautHashMap<TNTPrimed, String>();
-	private NautHashMap<TNTPrimed, GameTeam> _teams = new NautHashMap<TNTPrimed, GameTeam>();
+	private NautHashMap<TNTPrimed, String> _tnt = new NautHashMap<TNTPrimed, String>();
 	
 	private NautHashMap<Player, Double> _kills = new NautHashMap<Player, Double>();
 		
@@ -70,6 +72,7 @@ public class BombLobbers extends TeamGame implements IThrown
 				new KitJumper(manager),
 				new KitArmorer(manager),
 				new KitDetonator(manager),
+				new KitMortar(manager),
 				new KitWaller(manager)
 				}, new String[]
 						{
@@ -188,25 +191,38 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 		event.setCancelled(true);
 
-		
 		UtilInv.remove(player, Material.TNT, (byte) 0, 1);
 		UtilInv.Update(player);
 
-		TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()),TNTPrimed.class);
-		tnt.setFuseTicks(60);
+		TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
 		tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
+		tnt.setFuseTicks(60);
 
 		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
-		Manager.GetProjectile().AddThrow(tnt, event.getPlayer(), this, -1L, true, false, false, .2F);
-		
-		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
-		
-		_throwers.put(tnt, player.getName());
-		_teams.put(tnt, GetTeam(player));
-		
-		Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
-	}
+		Manager.GetProjectile().AddThrow(tnt, player, this, -1L, true, false, false, .2F);
 
+		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
+				
+		Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
+
+		_tnt.put(tnt, player.getName());
+	}
+	
+	public boolean hasThrower(TNTPrimed tnt)
+	{
+		return _tnt.containsKey(tnt);
+	}
+	
+	public void addThrower(Player player, TNTPrimed tnt)
+	{
+		_tnt.put(tnt, player.getName());
+	}
+	
+	public String getThrower(TNTPrimed tnt)
+	{
+		return _tnt.get(tnt);
+	}
+	
 	@EventHandler
 	public void onTNTExplode(ExplosionPrimeEvent event)
 	{
@@ -218,17 +234,16 @@ public class BombLobbers extends TeamGame implements IThrown
 
 		TNTPrimed tnt = (TNTPrimed) event.getEntity();
 				
-		if (!_throwers.containsKey(tnt))
+		if (!_tnt.containsKey(tnt))
 			return;
 
-		Player thrower = UtilPlayer.searchExact(_throwers.get(tnt));
+		Player thrower = UtilPlayer.searchExact(_tnt.get(tnt));
 				
 		if (thrower == null)
 		{
 			event.setCancelled(true);
 
-			_throwers.remove(tnt);
-			_teams.remove(tnt);
+			_tnt.remove(tnt);
 
 			event.getEntity().remove();
 			return;
@@ -238,21 +253,30 @@ public class BombLobbers extends TeamGame implements IThrown
 		{
 			event.setCancelled(true);
 
-			_throwers.remove(tnt);
-			_teams.remove(tnt);
+			_tnt.remove(tnt);
 			
 			event.getEntity().remove();
 			
 			return;
 		}
 		
-		_throwers.remove(tnt);
-		_teams.remove(tnt);
+		TNTPreExplodeEvent preExplode = new TNTPreExplodeEvent(thrower, tnt);
+		Manager.getPlugin().getServer().getPluginManager().callEvent(preExplode);
 		
-		for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
+		if (preExplode.isCancelled())
 		{
-			Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
+			event.setCancelled(true);
+			tnt.remove();
 		}
+		else
+		{
+			for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
+			{
+				Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
+			}
+		}
+		
+		_tnt.remove(tnt);
 	}
 
 	@EventHandler
@@ -264,12 +288,31 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (!IsLive())
 			return;
 		
-		for (Entry<TNTPrimed, GameTeam> tnt : _teams.entrySet())
+		for (Entry<TNTPrimed, String> tnt : _tnt.entrySet())
 		{
-			if (tnt.getKey() != null && tnt.getKey().isValid() && !tnt.getKey().isOnGround())
-			{
-				UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), tnt.getValue().GetColorBase().getRed(), tnt.getValue().GetColorBase().getGreen(), tnt.getValue().GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
-			}
+			if (tnt.getKey() == null)
+				continue;
+			
+			if (!tnt.getKey().isValid())
+				continue;
+			
+			if (UtilEnt.isGrounded(tnt.getKey()) || tnt.getKey().isOnGround())
+				continue;
+			
+			Player thrower = UtilPlayer.searchExact(tnt.getValue());
+			
+			if (thrower == null)
+				continue;
+			
+			if (!IsPlaying(thrower))
+				continue;
+			
+			GameTeam team = GetTeam(thrower);
+			
+			if (team == null)
+				continue;
+			
+			UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 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/events/TNTPreExplodeEvent.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTPreExplodeEvent.java
new file mode 100644
index 000000000..e79bc6f5c
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTPreExplodeEvent.java
@@ -0,0 +1,52 @@
+package nautilus.game.arcade.game.games.lobbers.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+public class TNTPreExplodeEvent extends PlayerEvent implements Cancellable
+{
+	private static final HandlerList _handlers = new HandlerList();
+
+	private boolean _cancelled = false;
+	
+	private TNTPrimed _tnt;
+		
+	public TNTPreExplodeEvent(Player thrower, TNTPrimed tnt)
+	{
+		super(thrower);
+		
+		_tnt = tnt;
+	}
+	
+	public TNTPrimed getTNT()
+	{
+		return _tnt;
+	}
+	
+	@Override
+	public void setCancelled(boolean flag)
+	{
+		_cancelled = flag;
+	}
+	
+	@Override
+	public boolean isCancelled()
+	{
+		return _cancelled;
+	}
+	
+	public static HandlerList getHandlerList()
+	{
+		return _handlers;
+	}
+	
+	@Override
+	public HandlerList getHandlers()
+	{
+		return getHandlerList();
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitMortar.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitMortar.java
new file mode 100644
index 000000000..52f24b832
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitMortar.java
@@ -0,0 +1,36 @@
+package nautilus.game.arcade.game.games.lobbers.kits;
+
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
+import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkMortar;
+import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkMorterCraftman;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+public class KitMortar extends Kit
+{
+	public KitMortar(ArcadeManager manager)
+	{
+		super(manager, "Mortar", KitAvailability.Gem, 6000, new String[]
+				{
+				"He loves the big guns."
+				}, new Perk[]
+						{
+				new PerkMortar(),
+				new PerkCraftman(),
+				new PerkMorterCraftman()
+						}, EntityType.ZOMBIE, new ItemBuilder(Material.FIREBALL).build());
+	}
+
+	@Override
+	public void GiveItems(Player player)
+	{
+		
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index 686cd1186..9373d293b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -28,7 +28,7 @@ public class PerkCraftman extends Perk
 	{
 		super("Craftman", new String[]
 				{
-				C.cGray + "Recieve 1 TNT every " + C.cYellow + giveTime / 1000 + C.cGray + " seconds. Maximum of 3."
+				C.cGray + "Recieve 1 TNT every " + C.cYellow + giveTime / 1000 + " Seconds." + C.cGray + " Maximum of 3."
 				});
 		
 		_recharge = Recharge.Instance;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
new file mode 100644
index 000000000..e79aaefff
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
@@ -0,0 +1,116 @@
+package nautilus.game.arcade.game.games.lobbers.kits.perks;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilAction;
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilInv;
+import nautilus.game.arcade.game.games.lobbers.BombLobbers;
+import nautilus.game.arcade.game.games.lobbers.events.TNTPreExplodeEvent;
+import nautilus.game.arcade.kit.Perk;
+
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.util.Vector;
+
+public class PerkMortar extends Perk
+{
+	private Set<TNTPrimed> _scatter = new HashSet<TNTPrimed>();
+	
+	public PerkMortar()
+	{
+		super("Mortar", new String[]
+				{
+				C.cYellow + "Right Click" + C.cGray + " Fireball to " + C.cGreen + "Fire Mortar",
+				"Mortars will explode after " + C.cYellow + "2 Seconds",
+				"releasing 3 more TNT, each with a 3 second fuse.",
+				"Your TNT will not scatter if it is grounded."
+				});
+	}
+	
+	@EventHandler
+	public void throwTNT(PlayerInteractEvent event)
+	{
+		if (event.getAction() == Action.PHYSICAL)
+			return;
+		
+		if (!Manager.GetGame().IsLive())
+			return;
+
+		if (!(Manager.GetGame() instanceof BombLobbers))
+			return;
+			
+		BombLobbers l = (BombLobbers) Manager.GetGame();
+		
+		Player player = event.getPlayer();
+
+		if (!Manager.IsAlive(player))
+			return;
+
+		if (!UtilInv.IsItem(player.getItemInHand(), Material.FIREBALL, (byte) 0))
+			return;
+		
+		event.setCancelled(true);
+
+		UtilInv.remove(player, Material.FIREBALL, (byte) 0, 1);
+		UtilInv.Update(player);
+
+		TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
+		tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
+		tnt.setFuseTicks(40);
+		
+		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
+		Manager.GetProjectile().AddThrow(tnt, player, l, -1L, true, false, false, .2F);
+
+		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
+		
+		l.addThrower(player, tnt);
+	}
+	
+	@EventHandler
+	public void onExplode(TNTPreExplodeEvent event)
+	{
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		if (!Kit.HasKit(event.getPlayer()))
+			return;
+		
+		if (event.getTNT().isOnGround() || UtilEnt.isGrounded(event.getTNT()))
+			return;
+		
+		if (!(Manager.GetGame() instanceof BombLobbers))
+			return;
+		
+		BombLobbers l = (BombLobbers) Manager.GetGame();
+
+		event.setCancelled(true);
+		
+		if (_scatter.contains(event.getTNT()))
+		{
+			_scatter.remove(event.getTNT());
+			return;
+		}
+		
+		for (int i = -1 ; i < 2 ; i++)
+		{
+			TNTPrimed tnt = (TNTPrimed) event.getTNT().getWorld().spawn(event.getTNT().getLocation(), TNTPrimed.class);
+			tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), event.getPlayer().getUniqueId()));
+			tnt.setFuseTicks(60);
+			
+			UtilAction.velocity(tnt, event.getTNT().getVelocity().add(new Vector(i / 5, 0, i / 5)).normalize(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
+			Manager.GetProjectile().AddThrow(tnt, event.getPlayer(), l, -1L, true, false, false, .2F);
+			
+			l.addThrower(event.getPlayer(), tnt);
+			_scatter.add(tnt);
+		}
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMorterCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMorterCraftman.java
new file mode 100644
index 000000000..9ea4ddd91
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMorterCraftman.java
@@ -0,0 +1,55 @@
+package nautilus.game.arcade.game.games.lobbers.kits.perks;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilInv;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.recharge.Recharge;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.kit.Perk;
+
+public class PerkMorterCraftman extends Perk
+{
+	private Recharge _recharge;
+
+	public PerkMorterCraftman()
+	{
+		super("Morter Craftman", new String[]
+				{
+				"You will recieve 1 mortar every " + C.cYellow + "10 Seconds.",
+				"Maximum of 1."
+				});
+		
+		_recharge = Recharge.Instance;
+	}
+	
+	@EventHandler
+	public void give(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+			return;
+		
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		for (Player player : Manager.GetGame().GetPlayers(true))
+		{
+			if (!Kit.HasKit(player))
+				continue;
+			
+			if (!_recharge.use(player, "Mortar Give", 10000, false, false))
+				continue;
+			
+			//Has 1
+			if (UtilInv.contains(player, Material.FIREBALL, (byte) 0, 1))
+				continue;
+			
+			UtilInv.insert(player, new ItemBuilder(Material.FIREBALL).setTitle(F.item("Mortar")).build());
+		}
+	}
+}

From eff71c3e17277f228292e4ad847af5d511851a25 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 22 Jul 2015 08:10:57 +1200
Subject: [PATCH 24/70] Champions: Add Morten G's changes to fix BlockToss

---
 .../classcombat/Skill/Brute/BlockToss.java    |  7 +++++
 .../arcade/game/games/common/Domination.java  | 28 +++++++++++++++++++
 .../game/games/common/TeamDeathmatch.java     | 27 ++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
index 9bf9994fc..62e021929 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
@@ -111,6 +111,13 @@ public class BlockToss extends SkillCharge implements IThrown
 			return;
 		}
 
+		// Ladder and beacon grabs
+		if (grab.getType() == Material.LADDER || grab.getType() == Material.BEACON)
+		{
+			UtilPlayer.message(player, F.main(GetName(), "You cannot grab this block."));
+			return;
+		}
+
 		//TrapDoor or ladder
 		for (int x = -1; x <= 1; x++)
 		{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java
index cc96c5dad..1ff47bd80 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java
@@ -6,12 +6,17 @@ import java.util.HashMap;
 
 
 
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ItemDespawnEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
@@ -127,6 +132,29 @@ public class Domination extends TeamGame
 				team.SetColor(ChatColor.BLUE);
 	}
 
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void blockliquidFlow(BlockPhysicsEvent event)
+	{
+		Material matOfBlock = event.getBlock().getType();
+
+		if (matOfBlock == Material.STATIONARY_WATER || matOfBlock == Material.SAND || matOfBlock == Material.GRAVEL || matOfBlock == Material.STATIONARY_LAVA)
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onTNTExplode(EntityExplodeEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (event.getEntityType() == EntityType.PRIMED_TNT)
+		{
+			event.setCancelled(true);
+		}
+	}
+
 	@EventHandler
 	public void Updates(UpdateEvent event)
 	{  
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java
index 4ea0687be..1e26628f7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java
@@ -5,11 +5,15 @@ import java.util.HashMap;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityShootBowEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.scoreboard.Objective;
@@ -95,6 +99,29 @@ public class TeamDeathmatch extends TeamGame
 		}
 	}
 
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void blockliquidFlow(BlockPhysicsEvent event)
+	{
+		Material matOfBlock = event.getBlock().getType();
+
+		if (matOfBlock == Material.STATIONARY_WATER || matOfBlock == Material.SAND || matOfBlock == Material.GRAVEL || matOfBlock == Material.STATIONARY_LAVA)
+		{
+			event.setCancelled(true);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST)
+	public void onTNTExplode(EntityExplodeEvent event)
+	{
+		if (!IsLive())
+			return;
+
+		if (event.getEntityType() == EntityType.PRIMED_TNT)
+		{
+			event.setCancelled(true);
+		}
+	}
+
 	@EventHandler 
 	public void PlayerKillAward(CombatDeathEvent event)
 	{ 

From b9762bddc422cab2a532cd9a21a3f036c09ddfbe Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Wed, 22 Jul 2015 16:50:57 -0400
Subject: [PATCH 25/70] Fixes

---
 .../src/mineplex/core/game/GameDisplay.java   |  2 +-
 .../core/projectile/ProjectileManager.java    | 23 +++--
 .../core/projectile/ProjectileUser.java       | 30 ++++---
 .../game/games/lobbers/BombLobbers.java       | 24 +++---
 .../game/games/lobbers/kits/KitDetonator.java | 84 +++++++++++++++----
 .../games/lobbers/kits/perks/PerkWaller.java  |  2 +-
 6 files changed, 116 insertions(+), 49 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index dbb06498f..65e1d6da4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -27,7 +27,7 @@ public enum GameDisplay
 	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
 	HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
 	Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
-	Lobbers("Bomb Lobbers", Material.FIREWORK_CHARGE, (byte) 0, GameCategory.ARCADE, 53),
+	Lobbers("Bomb Lobbers", Material.FIREBALL, (byte) 0, GameCategory.ARCADE, 53),
 	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
 	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
 	MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
index a3e3fb661..132500dc8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
@@ -1,15 +1,13 @@
 package mineplex.core.projectile;
 
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.WeakHashMap;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.common.util.UtilParticle.ParticleType;
-import mineplex.core.disguise.DisguiseManager;
-import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 
 import org.bukkit.Effect;
 import org.bukkit.Sound;
@@ -35,7 +33,7 @@ public class ProjectileManager extends MiniPlugin
 	{
 		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
 				expireTime, hitPlayer, hitBlock, idle, false,
-				null, 1f, 1f, null, 0, null, null, hitboxGrow));  
+				null, 1f, 1f, null, 0, null, null, 0F, 0F, 0F, 0F, 1, hitboxGrow));  
 	}
 	
 	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
@@ -43,7 +41,7 @@ public class ProjectileManager extends MiniPlugin
 	{
 		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
 				expireTime, hitPlayer, hitBlock, idle, pickup, 
-				null, 1f, 1f, null, 0, null, null, hitboxGrow)); 
+				null, 1f, 1f, null, 0, null, null, 0F, 0F, 0F, 0F, 1, hitboxGrow)); 
 	}
 		
 	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
@@ -52,7 +50,7 @@ public class ProjectileManager extends MiniPlugin
 	{
 		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
 				expireTime, hitPlayer, hitBlock, idle, false,
-				sound, soundVolume, soundPitch, effect, effectData, effectRate, null, hitboxGrow)); 
+				sound, soundVolume, soundPitch, effect, effectData, effectRate, null, 0F, 0F, 0F, 0F, 1, hitboxGrow)); 
 	}
 	
 	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
@@ -61,7 +59,7 @@ public class ProjectileManager extends MiniPlugin
 	{
 		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
 				expireTime, hitPlayer, hitBlock, idle, false,
-				sound, soundVolume, soundPitch, effect, effectData, effectRate, particle, hitboxGrow)); 
+				sound, soundVolume, soundPitch, effect, effectData, effectRate, particle, 0F, 0F, 0F, 0F, 1, hitboxGrow)); 
 	}
 	
 	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
@@ -70,7 +68,16 @@ public class ProjectileManager extends MiniPlugin
 	{
 		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
 				expireTime, hitPlayer, hitBlock, idle, false,
-				sound, soundVolume, soundPitch, null, 0, effectRate, particle, hitboxMult)); 
+				sound, soundVolume, soundPitch, null, 0, effectRate, particle, 0F, 0F, 0F, 0F, 1, hitboxMult)); 
+	}
+	
+	public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback, 
+			long expireTime, boolean hitPlayer, boolean hitBlock, boolean idle,
+			Sound sound, float soundVolume, float soundPitch, ParticleType particle, float pX, float pY, float pZ, float pS, int pC, UpdateType effectRate, float hitboxMult)
+	{
+		_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, 
+				expireTime, hitPlayer, hitBlock, idle, false,
+				sound, soundVolume, soundPitch, null, 0, effectRate, particle, pX, pY, pZ, pS, pC, hitboxMult)); 
 	}
 		
 	@EventHandler
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
index a19cf5caa..6c94d9e00 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
@@ -1,16 +1,13 @@
 package mineplex.core.projectile;
 
-import mineplex.core.updater.event.UpdateEvent;
-import mineplex.core.updater.UpdateType;
 import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilParticle;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
-import mineplex.core.disguise.DisguiseManager;
-import mineplex.core.disguise.disguises.DisguiseSquid;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import net.minecraft.server.v1_7_R4.AxisAlignedBB;
 import net.minecraft.server.v1_7_R4.MathHelper;
 import net.minecraft.server.v1_7_R4.MovingObjectPosition;
@@ -25,7 +22,6 @@ import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
@@ -46,7 +42,14 @@ public class ProjectileUser
 	private Sound _sound = null;
 	private float _soundVolume = 1f;
 	private float _soundPitch = 1f;
+	
 	private ParticleType _particle = null;
+	private float _particleX = 0F;
+	private float _particleY = 0F;
+	private float _particleZ = 0F;
+	private float _particleS = 0F;
+	private int _particleC = 1;
+	
 	private Effect _effect = null;
 	private int _effectData = 0;
 	private UpdateType _effectRate = UpdateType.TICK;
@@ -57,8 +60,8 @@ public class ProjectileUser
 			long expireTime, boolean hitPlayer, boolean hitBlock, boolean idle, boolean pickup,
 			Sound sound, float soundVolume, float soundPitch, 
 			Effect effect, int effectData, UpdateType effectRate,
-			ParticleType particle,
-			double hitboxMult) 
+			ParticleType particle, float particleX, float particleY, 
+			float particleZ, float particleS, int particleC, double hitboxMult) 
 	{
 		Throw = throwInput;
 
@@ -76,6 +79,11 @@ public class ProjectileUser
 		_soundVolume = soundVolume;
 		_soundPitch = soundPitch;
 		_particle = particle;
+		_particleX = particleX;
+		_particleY = particleY;
+		_particleZ = particleZ;
+		_particleS = particleS;
+		_particleC = particleC;
 		_effect = effect;
 		_effectData = effectData;
 		_effectRate = effectRate;
@@ -95,7 +103,7 @@ public class ProjectileUser
 			_thrown.getWorld().playEffect(_thrown.getLocation(), _effect, _effectData);
 		
 		if (_particle != null)
-			UtilParticle.PlayParticle(_particle, _thrown.getLocation(), 0f, 0f, 0f, 0, 1,
+			UtilParticle.PlayParticle(_particle, _thrown.getLocation(), _particleX, _particleY, _particleZ, _particleS, _particleC,
 					ViewDist.LONG, UtilServer.getPlayers());
 
 	}
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 fd518af67..329e33c5b 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
@@ -32,7 +32,6 @@ 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.KitDetonator;
 import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
-import nautilus.game.arcade.game.games.lobbers.kits.KitMortar;
 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;
@@ -44,7 +43,6 @@ import nautilus.game.arcade.kit.Kit;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -72,7 +70,7 @@ public class BombLobbers extends TeamGame implements IThrown
 				new KitJumper(manager),
 				new KitArmorer(manager),
 				new KitDetonator(manager),
-				new KitMortar(manager),
+//				new KitMortar(manager),
 				new KitWaller(manager)
 				}, new String[]
 						{
@@ -188,7 +186,7 @@ public class BombLobbers extends TeamGame implements IThrown
 
 		if (!UtilInv.IsItem(player.getItemInHand(), Material.TNT, (byte) 0))
 			return;
-		
+				
 		event.setCancelled(true);
 
 		UtilInv.remove(player, Material.TNT, (byte) 0, 1);
@@ -199,9 +197,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		tnt.setFuseTicks(60);
 
 		UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
-		Manager.GetProjectile().AddThrow(tnt, player, this, -1L, true, false, false, .2F);
-
-		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
+		Manager.GetProjectile().AddThrow(tnt, player, this, -1L, true, false, true, .2F);
 				
 		Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
 
@@ -218,9 +214,17 @@ public class BombLobbers extends TeamGame implements IThrown
 		_tnt.put(tnt, player.getName());
 	}
 	
-	public String getThrower(TNTPrimed tnt)
+	public void removeThrower(TNTPrimed tnt)
 	{
-		return _tnt.get(tnt);
+		_tnt.remove(tnt);
+	}
+	
+	public Player getThrower(TNTPrimed tnt)
+	{
+		if (_tnt.get(tnt) == null)
+			return null;
+			
+		return UtilPlayer.searchExact(_tnt.get(tnt));
 	}
 	
 	@EventHandler
@@ -312,7 +316,7 @@ public class BombLobbers extends TeamGame implements IThrown
 			if (team == null)
 				continue;
 			
-			UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.5, 0.0), team.GetColorBase().getRed(), team.GetColorBase().getGreen(), team.GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
+			UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().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/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index 8536d1afb..f0ad0da20 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -1,12 +1,17 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
+import java.util.Map.Entry;
+
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
+import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.game.games.lobbers.BombLobbers;
 import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
 import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
@@ -16,23 +21,26 @@ import nautilus.game.arcade.kit.Perk;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
 
 public class KitDetonator extends Kit
 {
+	private NautHashMap<TNTPrimed, Integer> _fuseTimes = new NautHashMap<TNTPrimed, Integer>();
 
 	public KitDetonator(ArcadeManager manager)
 	{
 		super(manager, "Detonator", KitAvailability.Gem, 4000, new String[]
 				{
-				"He doesn't like to wait. Max fuse of 3 and min fuse of 2.",
-				"",
+				"He doesn't like to wait. ",
 				C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Fuse Time.",
-				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time."
+				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time.",
+				"Maximum fuse time of " + C.cYellow + "6 Seconds.",
+				"Minimum fuse time of " + C.cYellow + "2 Seconds.",
 				}, new Perk[]
 						{
 				new PerkCraftman(6000)
@@ -43,13 +51,7 @@ public class KitDetonator extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).setAmount(2).build());
-	}
-	
-	@Override
-	public void SpawnCustom(LivingEntity ent)
-	{
-
+		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).setAmount(3).build());
 	}
 
 	@EventHandler
@@ -69,14 +71,13 @@ public class KitDetonator extends Kit
 		}
 		else
 		{
-			if (lever.getAmount() <= 0 || lever.getAmount() > 3)
+			if (lever.getAmount() < 2 || lever.getAmount() > 6)
 			{
 				GiveItems(event.getPlayer());
 			}
-			else
-			{
-				event.getTNT().setFuseTicks(lever.getAmount() * 20);
-			}
+
+			event.getTNT().setFuseTicks(lever.getAmount() * 20);
+			_fuseTimes.put(event.getTNT(), lever.getAmount() * 20);
 		}		
 	}
 	
@@ -100,7 +101,7 @@ public class KitDetonator extends Kit
 		//Right
 		if (UtilEvent.isAction(event, ActionType.R))
 		{
-			if (amount >= 3)
+			if (amount >= 6)
 				return;
 			
 			UtilInv.insert(event.getPlayer(), new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).build());
@@ -116,5 +117,52 @@ public class KitDetonator extends Kit
 			UtilInv.Update(event.getPlayer());
 		}
 		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.CLICK, 3.0F, 1.0F);
-	}	
+	}
+	
+	@EventHandler
+	public void respawnBombs(UpdateEvent event)
+	{
+		if (!(Manager.GetGame() instanceof BombLobbers))
+			return;
+
+		BombLobbers l = (BombLobbers) Manager.GetGame();
+		
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		for (Entry<TNTPrimed, Integer> entry : _fuseTimes.entrySet())
+		{
+			if (entry.getKey() == null || !entry.getKey().isValid())
+				return;
+			
+			//If it will need respawning
+			if (entry.getValue() > 60)
+			{
+				//If it's near 60 ticks								
+				//2 tick leeway
+				if (entry.getKey().getFuseTicks() >= 60 && entry.getKey().getFuseTicks() <= 62)
+				{
+					Player player = l.getThrower(entry.getKey());
+					
+					if (player == null)
+					{
+						continue;
+					}
+					
+					TNTPrimed newTNT = entry.getKey().getWorld().spawn(entry.getKey().getLocation(), TNTPrimed.class);
+					newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
+					newTNT.setVelocity(entry.getKey().getVelocity());
+					newTNT.setFuseTicks(59);
+
+					Manager.GetProjectile().AddThrow(newTNT, player, l, -1L, true, false, true, .2F);
+					
+					entry.getKey().remove();
+					l.removeThrower(entry.getKey());
+					_fuseTimes.remove(entry.getKey());
+
+					l.addThrower(player, newTNT);
+				}
+			}
+		}
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index 81b16ed8d..7f696aa22 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -88,7 +88,7 @@ public class PerkWaller extends Perk
 		
 		for (TNTPrimed tnt : _tnt)
 		{
-			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 2.0F).keySet())
+			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 3.0F).keySet())
 			{
 				if (_wallBlocks.contains(near.getLocation()))
 				{

From e6386744444c1ebce9d3d7af121d5bf793c9e191 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Wed, 22 Jul 2015 20:17:19 -0400
Subject: [PATCH 26/70] Fixed fuse on detonator

---
 .../game/games/lobbers/kits/KitDetonator.java | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index f0ad0da20..304ccf255 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -12,6 +12,7 @@ import mineplex.core.itemstack.ItemBuilder;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.lobbers.BombLobbers;
+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.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
@@ -30,7 +31,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 
 public class KitDetonator extends Kit
 {
-	private NautHashMap<TNTPrimed, Integer> _fuseTimes = new NautHashMap<TNTPrimed, Integer>();
+	private NautHashMap<TNTPrimed, Long> _respawnTimes = new NautHashMap<TNTPrimed, Long>();
 
 	public KitDetonator(ArcadeManager manager)
 	{
@@ -77,7 +78,11 @@ public class KitDetonator extends Kit
 			}
 
 			event.getTNT().setFuseTicks(lever.getAmount() * 20);
-			_fuseTimes.put(event.getTNT(), lever.getAmount() * 20);
+			
+			if (lever.getAmount() > 3)
+			{
+				_respawnTimes.put(event.getTNT(), System.currentTimeMillis() + 3000);
+			}
 		}		
 	}
 	
@@ -130,39 +135,41 @@ public class KitDetonator extends Kit
 		if (!Manager.GetGame().IsLive())
 			return;
 		
-		for (Entry<TNTPrimed, Integer> entry : _fuseTimes.entrySet())
+		for (Entry<TNTPrimed, Long> entry : _respawnTimes.entrySet())
 		{
 			if (entry.getKey() == null || !entry.getKey().isValid())
 				return;
 			
 			//If it will need respawning
-			if (entry.getValue() > 60)
+			if (System.currentTimeMillis() >= entry.getValue())
 			{
-				//If it's near 60 ticks								
-				//2 tick leeway
-				if (entry.getKey().getFuseTicks() >= 60 && entry.getKey().getFuseTicks() <= 62)
-				{
-					Player player = l.getThrower(entry.getKey());
-					
-					if (player == null)
-					{
-						continue;
-					}
-					
-					TNTPrimed newTNT = entry.getKey().getWorld().spawn(entry.getKey().getLocation(), TNTPrimed.class);
-					newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
-					newTNT.setVelocity(entry.getKey().getVelocity());
-					newTNT.setFuseTicks(59);
+				Player player = l.getThrower(entry.getKey());
 
-					Manager.GetProjectile().AddThrow(newTNT, player, l, -1L, true, false, true, .2F);
-					
-					entry.getKey().remove();
-					l.removeThrower(entry.getKey());
-					_fuseTimes.remove(entry.getKey());
+				if (player == null)
+					continue;
 
-					l.addThrower(player, newTNT);
-				}
+				TNTPrimed newTNT = entry.getKey().getWorld().spawn(entry.getKey().getLocation(), TNTPrimed.class);
+				newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
+				newTNT.setVelocity(entry.getKey().getVelocity());
+				newTNT.setFuseTicks(60);
+
+				Manager.GetProjectile().AddThrow(newTNT, player, l, -1L, true, false, true, .2F);
+
+				entry.getKey().remove();
+				l.removeThrower(entry.getKey());
+				_respawnTimes.remove(entry.getKey());
+
+				l.addThrower(player, newTNT);
 			}
 		}
 	}
+	
+	@EventHandler
+	public void onExplode(TNTPreExplodeEvent event)
+	{
+		if (_respawnTimes.containsKey(event.getTNT()))
+		{
+			_respawnTimes.remove(event.getTNT());
+		}
+	}
 }

From e4ecc9e85856c7b1eabeb51d7fea6338d0eaf5d3 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Wed, 22 Jul 2015 23:31:07 -0400
Subject: [PATCH 27/70] http://pastebin.com/BRhT7pZP

---
 .../core/achievement/Achievement.java         |  2 +-
 .../mineplex/core/cosmetic/ui/page/Menu.java  |  3 +
 .../gadget/gadgets/ItemMelonLauncher.java     |  3 +-
 .../src/mineplex/core/game/GameDisplay.java   |  2 +-
 .../core/treasure/TreasureLocation.java       |  5 +-
 .../hub/server/ui/ServerGameMenu.java         |  2 +-
 .../game/classcombat/Skill/Mage/Rupture.java  |  2 +-
 .../nautilus/game/arcade/ArcadeManager.java   |  5 ++
 .../game/arcade/addons/SoupAddon.java         |  3 +
 .../game/games/bridge/kits/KitBeserker.java   |  2 +-
 .../arcade/game/games/build/BuildData.java    | 10 +++-
 .../game/games/minestrike/MineStrike.java     | 11 ++++
 .../arcade/game/games/smash/SuperSmash.java   |  2 +-
 .../game/games/smash/kits/KitChicken.java     |  2 +-
 .../game/games/smash/kits/KitSheep.java       |  4 +-
 .../game/arcade/game/games/spleef/Spleef.java |  3 +
 .../game/games/spleef/kits/KitSnowballer.java |  2 +-
 .../game/arcade/kit/perks/PerkArcticAura.java | 14 +++--
 .../game/arcade/kit/perks/PerkDestructor.java |  4 +-
 .../arcade/kit/perks/PerkSheepHoming.java     |  2 +-
 .../game/arcade/managers/GameFlagManager.java |  8 ++-
 .../arcade/managers/GamePlayerManager.java    | 58 ++++++++++---------
 .../arcade/stats/LastStandStatTracker.java    |  9 ++-
 23 files changed, 104 insertions(+), 54 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/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
index 4e779d687..f77c4851f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
@@ -52,6 +52,9 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
 						" ",
 						ChatColor.RESET + C.cPurple + "Hero Rank",
 						ChatColor.RESET + "Receives 15000 Coins per Month",
+						" ",
+						ChatColor.RESET + C.cGreen + "Legend Rank",
+						ChatColor.RESET + "Recieves 30000 Coins per Month"
 				}, 1, false));
 
 		addButton(18, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
index a2ee2c308..90c80cc1c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
@@ -126,7 +126,8 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown
 
 		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.EAT, 1f, 1f);
 
-		event.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 80, 1), true);
+		if (!event.getPlayer().hasPotionEffect(PotionEffectType.SPEED))
+			event.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 80, 1), true);
 	}
 
 	@EventHandler
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index 196b046e2..6dd84ea8e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -60,7 +60,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),
+	Skywars("Skywars", Material.FEATHER, (byte) 0, GameCategory.SURVIVAL, 52),
 
 	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
index 8911e6d3a..570eb152c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
@@ -99,7 +99,10 @@ public class TreasureLocation implements Listener
 
 		setHoloChestVisible(false);
 
-		if (treasureType == TreasureType.ANCIENT || treasureType == TreasureType.MYTHICAL)
+		if (treasureType == TreasureType.ANCIENT)
+			Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening an " + treasureType.getName()));
+		
+		if (treasureType == TreasureType.MYTHICAL)
 			Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening a " + treasureType.getName()));
 
 		Reward[] rewards = _treasureManager.getRewards(player, treasureType.getRewardType());
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 4e0c5bb3a..47a0e34d0 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
@@ -64,7 +64,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 					ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BR") + ChatColor.RESET + " other players!",
 				}));
 		
-		setItem(2, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Survival Games " + C.cGray + "Last Man Standing", new String[] 
+		setItem(2, ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Survival Games " + C.cGray + "Last Man Standing", new String[] 
 				{ 
 					ChatColor.RESET + "",
 					ChatColor.RESET + "Search for chests to find loot and ",
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
index 0f444315d..d8797a258 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
@@ -68,7 +68,7 @@ public class Rupture extends SkillActiveCharge
 				"",
 				"Release Block to release the rupture,",
 				"causing earth and players to fly upward,",
-				"dealing up to #4#1 inital damage."
+				"dealing up to #4#1 initial damage."
 				
 				});
 	}
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..9acbd0298 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -31,6 +31,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.server.ServerListPingEvent;
+import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 
 import com.google.common.base.Objects;
@@ -840,6 +841,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	{
 		player.setGameMode(GameMode.SURVIVAL);
 		player.setAllowFlight(false);
+		player.setFlySpeed(0.1F);
+		
 		UtilInv.Clear(player);
 
 		((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));
@@ -871,6 +874,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 
 		//Remove all conditions
 		GetCondition().EndCondition(player, null, null);
+		for (PotionEffect potion : player.getActivePotionEffects())
+			player.removePotionEffect(potion.getType());
 
 		HubClock(player);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/SoupAddon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/SoupAddon.java
index 92d5576ef..4174f64ff 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/SoupAddon.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/SoupAddon.java
@@ -40,6 +40,9 @@ public class SoupAddon extends MiniPlugin
 		
 		Player player = event.getPlayer();
 		
+		if (!Manager.GetGame().IsAlive(player))
+			return;
+		
 		if (!UtilGear.isMat(player.getItemInHand(), Material.MUSHROOM_SOUP))
 			return;
 		
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java
index 133f27aaf..fa56f9ce2 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java
@@ -20,7 +20,7 @@ public class KitBeserker extends Kit
 
 				new String[] 
 						{
-				"Agile warrior trained in the ways axe combat."
+				"Agile warrior trained in the ways of axe combat."
 						}, 
 
 						new Perk[] 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
index 4069df70f..a8306e7d1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
@@ -98,7 +98,15 @@ public class BuildData
 			return false;
 		}
 		
-		Particles.put(Player.getEyeLocation().add(Player.getLocation().getDirection()), particleType);
+		Location toPlace = Player.getEyeLocation().add(Player.getLocation().getDirection());
+		
+		if (!inBuildArea(toPlace.getBlock()))
+		{
+			UtilPlayer.message(Player, F.main("Game", "You cannot place particles outside your plot!"));
+			return false;
+		}
+		
+		Particles.put(toPlace, particleType);
 		
 		UtilPlayer.message(Player, F.main("Game", "You placed " + particleType.getFriendlyName() + "!"));
 		
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 b1900ffd7..45ec44424 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
@@ -1924,7 +1924,18 @@ public class MineStrike extends TeamGame
 		Announce(color + "===================================", false);
 
 		for (Player player : UtilServer.getPlayers())
+		{
 			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);
+			}
+		}
 
 		UtilTextMiddle.display(null, winnerLine, 20, 120, 20);
 
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..8ea1c5c8a 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
@@ -172,7 +172,7 @@ public class SuperSmash extends SoloGame
 		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!");
+			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/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java
index e66ed7509..91f27649c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java
@@ -40,7 +40,7 @@ public class KitChicken extends SmashKit
 								}, 
 								EntityType.CHICKEN,
 								new ItemStack(Material.EGG),
-								"Airial Gunner", 20000, Sound.CHICKEN_HURT);
+								"Aerial Gunner", 20000, Sound.CHICKEN_HURT);
 
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSheep.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSheep.java
index cbabc5f8f..06e392f7c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSheep.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSheep.java
@@ -76,7 +76,7 @@ public class KitSheep extends SmashKit
 						{
 			ChatColor.RESET + "Shear yourself and use the wool as",
 			ChatColor.RESET + "an explosive device. You can Right-Click",
-			ChatColor.RESET + "as second time to solidify the bomb, and",
+			ChatColor.RESET + "a second time to solidify the bomb, and",
 			ChatColor.RESET + "a third time to detonate it on command.",
 						}));
 		
@@ -98,7 +98,7 @@ public class KitSheep extends SmashKit
 							{
 				ChatColor.RESET + "Release one Homing Sheeple towards every player.",
 				ChatColor.RESET + "They will slowly home in on their target and",
-				ChatColor.RESET + "explode to deal devestating damage.",
+				ChatColor.RESET + "explode to deal devastating damage.",
 							}));
 
 		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java
index 6716ac290..c9d231bd0 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java
@@ -172,6 +172,9 @@ public class Spleef extends SoloGame
 
 		event.setCancelled(true);
 
+		if (event.getBlock().getType() == Material.BEDROCK)
+			return;
+		
 		BlockFade(event.getBlock(), event.getPlayer(), false);
 
 		//Snowball
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java
index 36cafe126..5e1ecc8d9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java
@@ -21,7 +21,7 @@ public class KitSnowballer extends Kit
 				new String[] 
 						{
 				"Throw snowballs to break blocks!",
-				"Receives 2 Snowball when you punch blocks!"
+				"Receives 1 Snowball when you punch blocks!"
 						}, 
 
 						new Perk[] 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
index ece2ee4b7..cd84bcc8f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
@@ -2,16 +2,17 @@ package nautilus.game.arcade.kit.perks;
 
 import java.util.HashMap;
 
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.kit.Perk;
 
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
 public class PerkArcticAura extends Perk
 {
 	public PerkArcticAura() 
@@ -32,7 +33,10 @@ public class PerkArcticAura extends Perk
 		{	
 			if (!Kit.HasKit(player))
 				continue;
-
+			
+			if (((CraftPlayer) player).getHandle().spectating)
+				continue;
+			
 			double range = 5*player.getExp();
 			
 			//Blocks
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java
index 45a67cde4..96311faab 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java
@@ -89,8 +89,8 @@ public class PerkDestructor extends Perk
 	{
 		if (event.isCancelled())
 			return;
-
-		if (!UtilInv.IsItem(event.getItemDrop().getItemStack(), Material.ENDER_PEARL, (byte) 0))
+		
+		if (!UtilInv.IsItem(event.getItemDrop().getItemStack(), "Seismic Charge", Material.ENDER_PEARL, (byte) 0))
 			return;
 
 		//Cancel
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSheepHoming.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSheepHoming.java
index 8e7ee1331..eea416543 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSheepHoming.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSheepHoming.java
@@ -28,7 +28,7 @@ public class PerkSheepHoming extends SmashPerk
 	
 	public PerkSheepHoming() 
 	{
-		super("Homing Sheepiles", new String[] 
+		super("Homing Sheeples", new String[] 
 				{ 
 				}, 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 cf954185b..dafbc7416 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
@@ -721,6 +721,12 @@ public class GameFlagManager implements Listener
 			
 			UtilAction.velocity(player, new Vector(0,0,0), 1, true, 0.4, 0, 1, true);
 			
+			if (!game.IsAlive(player))
+			{
+				Manager.addSpectator(player, true);
+				return;
+			}
+			
 			UtilPlayer.message(player, C.cWhite + C.Bold + "You will respawn in " + time + " seconds...");
 			UtilTextMiddle.display(null, "Respawning in " + time + " seconds...", 5, 40, 5, player);
 	
@@ -732,7 +738,7 @@ public class GameFlagManager implements Listener
 					if (game.IsAlive(player))
 					{
 						game.RespawnPlayer(player);
-					} 
+					}
 					else
 					{
 						Manager.addSpectator(player, true);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
index 0c28bab88..3af8cabb7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
@@ -177,18 +177,18 @@ public class GamePlayerManager implements Listener
 
 		Player player = event.getPlayer();
 
+		GameTeam team = Manager.GetLobby().GetClickedTeam(event.getRightClicked());
+
+		if (team == null)
+			return;
+
 		//Observer
 		if (Manager.IsObserver(player))
 		{
 			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
 			return;
 		}
-
-		GameTeam team = Manager.GetLobby().GetClickedTeam(event.getRightClicked());
-
-		if (team == null)
-			return;
-
+		
 		TeamClick(player, team);
 	}
 
@@ -198,20 +198,20 @@ public class GamePlayerManager implements Listener
 		Player player = event.GetDamagerPlayer(false);
 		if (player == null)		return;
 
-		//Observer
-		if (Manager.IsObserver(player))
-		{
-			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
-			return;
-		}
-
 		LivingEntity target = event.GetDamageeEntity();
 
 		GameTeam team = Manager.GetLobby().GetClickedTeam(target);
 
 		if (team == null)
 			return;
-
+		
+		//Observer
+		if (Manager.IsObserver(player))
+		{
+			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+		
 		TeamClick(player, team);
 	}
 
@@ -265,6 +265,13 @@ public class GamePlayerManager implements Listener
 
 		Player player = event.getPlayer();
 
+		
+
+		Kit kit = Manager.GetLobby().GetClickedKit(event.getRightClicked());
+
+		if (kit == null)
+			return;
+		
 		//Observer
 		if (Manager.IsObserver(player) || Manager.isSpectator(player)) 
 		{
@@ -272,11 +279,6 @@ public class GamePlayerManager implements Listener
 			return;
 		}
 
-		Kit kit = Manager.GetLobby().GetClickedKit(event.getRightClicked());
-
-		if (kit == null)
-			return;
-
 		KitClick(player, kit, event.getRightClicked());
 
 		event.setCancelled(true);
@@ -294,12 +296,7 @@ public class GamePlayerManager implements Listener
 		Player player = event.GetDamagerPlayer(false);
 		if (player == null)		return;
 
-		//Observer
-		if (Manager.IsObserver(player) || Manager.isSpectator(player))
-		{
-			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
-			return;
-		}
+		
 
 		LivingEntity target = event.GetDamageeEntity();
 
@@ -307,7 +304,14 @@ public class GamePlayerManager implements Listener
 
 		if (kit == null)
 			return;
-
+		
+		//Observer
+		if (Manager.IsObserver(player) || Manager.isSpectator(player))
+		{
+			UtilPlayer.message(player, F.main("Game", "Spectators cannot partake in games."));
+			return;
+		}
+		
 		KitClick(player, kit, target);
 	}
 
@@ -340,7 +344,7 @@ public class GamePlayerManager implements Listener
 		{
 			Manager.GetGame().SetKit(player, kit, true);
 		}
-		else if (kit.GetAvailability() == KitAvailability.Gem && donor.GetBalance(CurrencyType.Gems) > kit.GetCost())
+		else if (kit.GetAvailability() == KitAvailability.Gem && donor.GetBalance(CurrencyType.Gems) >= kit.GetCost())
 		{
 			Manager.GetShop().openPageForPlayer(player, new ConfirmationPage<ArcadeManager, ArcadeShop>(
 					Manager, Manager.GetShop(), Manager.GetClients(), Manager.GetDonation(), new Runnable()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java
index 135888975..d1df0b6f5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/LastStandStatTracker.java
@@ -4,15 +4,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.TeamGame;
-import nautilus.game.arcade.game.games.castlesiege.kits.KitUndead;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 
 public class LastStandStatTracker extends StatTracker<TeamGame>
 {

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 28/70] 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 91db076053c51f444549b1af67c0fbe7da48a422 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 23 Jul 2015 09:28:35 -0400
Subject: [PATCH 29/70] Fixed lobbers icon in stats

---
 .../src/mineplex/core/achievement/AchievementCategory.java      | 2 +-
 1 file changed, 1 insertion(+), 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 bffc840e7..0f823efe0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
@@ -122,7 +122,7 @@ public enum AchievementCategory
 			
 	BOMB_LOBBERS("Bomb Lobbers", null,
 			new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
-			Material.TNT, 0, GameCategory.ARCADE, "Waller Kit");
+			Material.FIREBALL, 0, GameCategory.ARCADE, "Waller Kit");
 	
 	private String _name;
 	private String[] _statsToPull;

From 71148ef38739e772b79023bd7354b7f1206ed5db Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Thu, 23 Jul 2015 16:29:42 +0200
Subject: [PATCH 30/70] gave twitch same perms as youtubers

---
 .../src/mineplex/core/antihack/AntiHack.java         |  2 +-
 .../core/personalServer/PersonalServerManager.java   |  2 +-
 .../core/preferences/ui/PreferencesPage.java         |  2 +-
 .../src/nautilus/game/arcade/ArcadeManager.java      | 12 ++++++------
 .../nautilus/game/arcade/command/GameCommand.java    |  2 +-
 .../{YoutubeCommand.java => KitUnlockCommand.java}   |  8 ++++----
 .../src/nautilus/game/arcade/command/SetCommand.java |  2 +-
 .../nautilus/game/arcade/command/StartCommand.java   |  2 +-
 .../src/nautilus/game/arcade/kit/Kit.java            |  4 ++--
 .../game/arcade/managers/GameLobbyManager.java       |  2 +-
 .../game/arcade/managers/GamePlayerManager.java      |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/{YoutubeCommand.java => KitUnlockCommand.java} (63%)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
index f7371bf4c..37ff11c9b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
@@ -345,7 +345,7 @@ public class AntiHack extends MiniPlugin
 			}
 
 			//Auto-Kick
-			if (!handled && _clientManager.Get(player).GetRank() == Rank.YOUTUBE)
+			if (!handled && _clientManager.Get(player).GetRank() != Rank.YOUTUBE && _clientManager.Get(player).GetRank() != Rank.TWITCH)
 			{
 				player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 2f, 0.5f);
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
index 22b0f6e19..db709fd28 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
@@ -125,7 +125,7 @@ public class PersonalServerManager extends MiniPlugin
 
 		Rank rank = _clientManager.Get(player).GetRank();
 
-		if (eventServer || rank.Has(Rank.SNR_MODERATOR) || rank == Rank.YOUTUBE)
+		if (eventServer || rank.Has(Rank.SNR_MODERATOR) || rank == Rank.YOUTUBE || rank == Rank.TWITCH)
 		{
 			ram = 2048;
 			cpu = 4;
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 d09e9c3db..f293eaf8d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
@@ -255,7 +255,7 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
 		
 		buildPreference(40, Material.RED_ROSE, "Show Pending Friend Requests", userPreferences.PendingFriendRequests, _togglePendingFriendRequests);
 		
-		if (getClientManager().Get(getPlayer()).GetRank() == Rank.YOUTUBE)
+		if (getClientManager().Get(getPlayer()).GetRank() == Rank.YOUTUBE || getClientManager().Get(getPlayer()).GetRank() == Rank.TWITCH)
 		{
 			buildPreference(38, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
 			buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
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..3b23bac84 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -103,7 +103,7 @@ import nautilus.game.arcade.addons.TeamArmorAddon;
 import nautilus.game.arcade.command.DisguiseCommand;
 import nautilus.game.arcade.command.GameCommand;
 import nautilus.game.arcade.command.WriteCommand;
-import nautilus.game.arcade.command.YoutubeCommand;
+import nautilus.game.arcade.command.KitUnlockCommand;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.Game.GameState;
@@ -407,7 +407,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	{
 		addCommand(new GameCommand(this));
 		addCommand(new WriteCommand(this));
-		addCommand(new YoutubeCommand(this));
+		addCommand(new KitUnlockCommand(this));
 		addCommand(new DisguiseCommand(this));
 	}
 
@@ -1207,21 +1207,21 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		return _game != null && _game.InProgress();
 	}
 
-	public boolean isYoutuber(Player player)
+	public boolean hasKitsUnlocked(Player player)
 	{
 		return _youtube.contains(player);
 	}
 
-	public void setYoutuber(Player caller)
+	public void toggleUnlockKits(Player caller)
 	{
 		if (_youtube.remove(caller))
 		{
-			UtilPlayer.message(caller, C.cRed + C.Bold + "YouTube Mode Disabled: " + ChatColor.RESET + "Kits Locked");
+			UtilPlayer.message(caller, C.cRed + C.Bold + "Celebrity Mode Disabled: " + ChatColor.RESET + "Kits Locked");
 		}
 		else
 		{
 			_youtube.add(caller);
-			UtilPlayer.message(caller, C.cGreen + C.Bold + "YouTube Mode Enabled: " + ChatColor.RESET + "All Kits Unlocked");
+			UtilPlayer.message(caller, C.cGreen + C.Bold + "Celebrity Mode Enabled: " + ChatColor.RESET + "All Kits Unlocked");
 		}
 	}
 	
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..7cb8a6f80 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
@@ -12,7 +12,7 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
 {
 	public GameCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "game");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "game");
 		
 		AddCommand(new StartCommand(Plugin));
 		AddCommand(new StopCommand(Plugin));
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/YoutubeCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
similarity index 63%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/YoutubeCommand.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
index 454b19375..73cc210e7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/YoutubeCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
@@ -6,16 +6,16 @@ import nautilus.game.arcade.ArcadeManager;
 import mineplex.core.command.CommandBase;
 import mineplex.core.common.Rank;
 
-public class YoutubeCommand extends CommandBase<ArcadeManager>
+public class KitUnlockCommand extends CommandBase<ArcadeManager>
 {
-	public YoutubeCommand(ArcadeManager plugin)
+	public KitUnlockCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, new String[] {"youtube", "twitch"});
+		super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, new String[] {"youtube", "twitch", "kits"});
 	}
 
 	@Override
 	public void Execute(Player caller, String[] args)
 	{
-		Plugin.setYoutuber(caller);
+		Plugin.toggleUnlockKits(caller);
 	}
 }
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..0d7f183a7 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
@@ -18,7 +18,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
 { 
 	public SetCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "set");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "set");
 	}
  
 	@Override 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
index b78521dc9..7a7a0dd43 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
@@ -12,7 +12,7 @@ public class StartCommand extends CommandBase<ArcadeManager>
 {
 	public StartCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "start");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "start");
 	}
 
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
index 8327bcb7e..e23422a01 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
@@ -220,8 +220,8 @@ public abstract class Kit implements Listener
 		return _achivementCategory;
 	}
 	
-	public boolean isYoutuber(Player player)
+	public boolean hasKitsUnlocked(Player player)
 	{
-		return Manager.isYoutuber(player);
+		return Manager.hasKitsUnlocked(player);
 	}
 }
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..47879e6e5 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
@@ -1099,7 +1099,7 @@ public class GameLobbyManager implements Listener, IPacketHandler
 		}
 		
 		if (ent.GetKit().GetAvailability() == KitAvailability.Free || 										//Free
-			Manager.isYoutuber(player) || 																	//YouTube
+			Manager.hasKitsUnlocked(player) || 																	//YouTube
 			(ent.GetKit().GetAvailability() == KitAvailability.Achievement && 
 			Manager.GetAchievement().hasCategory(player, ent.GetKit().getAchievementRequirement())) ||		//Achievement
 			donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + ent.GetKit().GetName()) ||			//Green
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
index 0c28bab88..24f3c1f42 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
@@ -325,7 +325,7 @@ public class GamePlayerManager implements Listener
 
 		if (kit.GetAvailability() == KitAvailability.Free || 									//Free
 			
-			Manager.isYoutuber(player) || 														//YouTube
+			Manager.hasKitsUnlocked(player) || 														//YouTube
 			
 			(kit.GetAvailability() == KitAvailability.Achievement && 							//Achievement
 			Manager.GetAchievement().hasCategory(player, kit.getAchievementRequirement())) ||	

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 31/70] 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 06d4de16cf058be7f051a1d54bad01354a7c601b Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 23 Jul 2015 13:34:11 -0400
Subject: [PATCH 32/70] Changed particle methods

---
 .../game/games/lobbers/BombLobbers.java       | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 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 329e33c5b..9d5c7eb58 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
@@ -40,6 +40,7 @@ import nautilus.game.arcade.game.games.lobbers.trackers.TrackerNoDamage;
 import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
 import nautilus.game.arcade.kit.Kit;
 
+import org.bukkit.ChatColor;
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -58,7 +59,7 @@ public class BombLobbers extends TeamGame implements IThrown
 {
 	private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
 	
-	private NautHashMap<TNTPrimed, String> _tnt = new NautHashMap<TNTPrimed, String>();
+	private NautHashMap<TNTPrimed, BombToken> _tnt = new NautHashMap<TNTPrimed, BombToken>();
 	
 	private NautHashMap<Player, Double> _kills = new NautHashMap<Player, Double>();
 		
@@ -70,7 +71,7 @@ public class BombLobbers extends TeamGame implements IThrown
 				new KitJumper(manager),
 				new KitArmorer(manager),
 				new KitDetonator(manager),
-//				new KitMortar(manager),
+//				new KitMortar(manager), << Spare time kit for Bobbeh
 				new KitWaller(manager)
 				}, new String[]
 						{
@@ -201,7 +202,7 @@ public class BombLobbers extends TeamGame implements IThrown
 				
 		Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
 
-		_tnt.put(tnt, player.getName());
+		_tnt.put(tnt, new BombToken(player));
 	}
 	
 	public boolean hasThrower(TNTPrimed tnt)
@@ -211,7 +212,7 @@ public class BombLobbers extends TeamGame implements IThrown
 	
 	public void addThrower(Player player, TNTPrimed tnt)
 	{
-		_tnt.put(tnt, player.getName());
+		_tnt.put(tnt, new BombToken(player));
 	}
 	
 	public void removeThrower(TNTPrimed tnt)
@@ -224,7 +225,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (_tnt.get(tnt) == null)
 			return null;
 			
-		return UtilPlayer.searchExact(_tnt.get(tnt));
+		return UtilPlayer.searchExact(_tnt.get(tnt).Thrower);
 	}
 	
 	@EventHandler
@@ -241,7 +242,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (!_tnt.containsKey(tnt))
 			return;
 
-		Player thrower = UtilPlayer.searchExact(_tnt.get(tnt));
+		Player thrower = UtilPlayer.searchExact(_tnt.get(tnt).Thrower);
 				
 		if (thrower == null)
 		{
@@ -292,7 +293,7 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (!IsLive())
 			return;
 		
-		for (Entry<TNTPrimed, String> tnt : _tnt.entrySet())
+		for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
 		{
 			if (tnt.getKey() == null)
 				continue;
@@ -303,7 +304,8 @@ public class BombLobbers extends TeamGame implements IThrown
 			if (UtilEnt.isGrounded(tnt.getKey()) || tnt.getKey().isOnGround())
 				continue;
 			
-			Player thrower = UtilPlayer.searchExact(tnt.getValue());
+			BombToken token = tnt.getValue();
+			Player thrower = UtilPlayer.searchExact(token.Thrower);
 			
 			if (thrower == null)
 				continue;
@@ -316,7 +318,41 @@ public class BombLobbers extends TeamGame implements IThrown
 			if (team == null)
 				continue;
 			
-			UtilParticle.PlayParticle(ParticleType.RED_DUST, tnt.getKey().getLocation().clone().add(0.0, 0.6, 0.0), team.GetColorBase().getRed(), team.GetColorBase().getGreen(), team.GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
+			//A is current
+			//B is previous
+			token.B = token.A;
+			token.A = tnt.getKey().getLocation();
+
+			if (token.A == null || token.B == null)
+				continue;
+						
+			//Adapted from static lazer code
+			double curRange = 0;
+			double distance = Math.abs(token.A.distance(token.B));
+						
+			while (curRange <= distance)
+			{
+				Location newTarget = token.B.add(UtilAlg.getTrajectory(token.B, token.A).multiply(curRange));
+//				Location newTarget = player.getEyeLocation().add(player.getLocation().getDirection().multiply(curRange));
+								
+				//Progress Forwards
+				curRange += 0.2;
+				
+				if (team.GetColor() == ChatColor.AQUA)
+				{
+					for (int i = 0 ; i < 5 ; i++)
+						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), -1, 1, 1, 1, 0,
+								ViewDist.LONG, UtilServer.getPlayers());
+				}
+				else
+				{
+					for (int i = 0 ; i < 5 ; i++)
+						UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), 0, 0, 0, 0, 1,
+								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());
+			}
 		}
 	}
 	

From 335eb5eacdcf9d837af48445d9fa9a59b4ef986a Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 23 Jul 2015 13:35:06 -0400
Subject: [PATCH 33/70] Fixed report link

---
 Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index eaa6f0e2e..82808334e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -329,7 +329,7 @@ public class Chat extends MiniPlugin
 			UtilPlayer.message(sender, F.main("Chat", 
 					"Accusing players of cheating in-game is against the rules."
 					+ "If you think someone is cheating, please gather evidence and report it at "
-					+ F.link("www.mineplex.com/reports/")));
+					+ F.link("www.mineplex.com/reports")));
 			event.setCancelled(true);
 		}
 		else if (_playerLastMessage.containsKey(sender.getUniqueId()))

From 365968f41d386386b07caa105fdc8f2047ea958b Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Thu, 23 Jul 2015 16:26:43 -0400
Subject: [PATCH 34/70] Added a bomb token thing

---
 .../arcade/game/games/lobbers/BombToken.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java
new file mode 100644
index 000000000..eed18640a
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java
@@ -0,0 +1,16 @@
+package nautilus.game.arcade.game.games.lobbers;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public class BombToken
+{
+	public final String Thrower;
+	public Location A = null;
+	public Location B = null;
+	
+	public BombToken(Player player)
+	{
+		Thrower = player.getName();
+	}
+}

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 35/70] 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 36/70] 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 37/70] 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 38/70] 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 5d87d9e1e49c8646aed4e39a4f7c09327f01be11 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 02:01:55 -0400
Subject: [PATCH 39/70] .

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

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 9d5c7eb58..a05ed1cc3 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
@@ -171,6 +171,15 @@ public class BombLobbers extends TeamGame implements IThrown
 		}
 	}
 	
+	@EventHandler
+	public void disableFlying(GameStateChangeEvent event)
+	{
+		for (Player player : GetPlayers(true))
+		{
+			player.setAllowFlight(false);
+		}
+	}
+	
 	@EventHandler
 	public void throwTNT(PlayerInteractEvent event)
 	{

From a002da4c0f6d8e42e850310e4a6bcab1551263fb Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 03:21:56 -0400
Subject: [PATCH 40/70] Redid how lobbers works

---
 .../game/games/lobbers/BombLobbers.java       | 131 +++++++++++++++---
 .../arcade/game/games/lobbers/BombToken.java  |   4 +
 .../game/games/lobbers/kits/KitArmorer.java   |   2 +-
 .../game/games/lobbers/kits/KitDetonator.java |  89 ++----------
 .../game/games/lobbers/kits/KitJumper.java    |  30 ++--
 .../game/games/lobbers/kits/KitWaller.java    |   2 +-
 .../lobbers/kits/perks/PerkCraftman.java      |  14 +-
 .../games/lobbers/kits/perks/PerkMortar.java  |   4 +-
 8 files changed, 160 insertions(+), 116 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 a05ed1cc3..96bef6555 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
@@ -8,6 +8,7 @@ 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.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilParticle;
@@ -15,6 +16,7 @@ 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.explosion.ExplosionEvent;
 import mineplex.core.projectile.IThrown;
 import mineplex.core.projectile.ProjectileUser;
@@ -214,21 +216,6 @@ public class BombLobbers extends TeamGame implements IThrown
 		_tnt.put(tnt, new BombToken(player));
 	}
 	
-	public boolean hasThrower(TNTPrimed tnt)
-	{
-		return _tnt.containsKey(tnt);
-	}
-	
-	public void addThrower(Player player, TNTPrimed tnt)
-	{
-		_tnt.put(tnt, new BombToken(player));
-	}
-	
-	public void removeThrower(TNTPrimed tnt)
-	{
-		_tnt.remove(tnt);
-	}
-	
 	public Player getThrower(TNTPrimed tnt)
 	{
 		if (_tnt.get(tnt) == null)
@@ -292,6 +279,104 @@ public class BombLobbers extends TeamGame implements IThrown
 		
 		_tnt.remove(tnt);
 	}
+	
+	@EventHandler
+	public void updateTNT(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!IsLive())
+			return;
+		
+		for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
+		{
+			if (tnt.getKey() == null)
+				continue;
+			
+			if (!tnt.getKey().isValid())
+				continue;
+			
+			BombToken token = tnt.getValue();
+			Player thrower = UtilPlayer.searchExact(token.Thrower);
+			
+			if (thrower == null)
+				continue;
+			
+			if (!IsPlaying(thrower))
+				continue;
+			
+			if (!token.Primed)
+			{
+				if (tnt.getKey().getFuseTicks() <= 20)
+				{
+					//Respawn
+					TNTPrimed newTNT = tnt.getKey().getWorld().spawn(tnt.getKey().getLocation(), TNTPrimed.class);
+					newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), thrower.getUniqueId()));
+					newTNT.setVelocity(tnt.getKey().getVelocity());
+					newTNT.setFuseTicks(60);
+
+					Manager.GetProjectile().AddThrow(newTNT, thrower, this, -1L, true, false, true, .2F);
+					
+					tnt.getKey().remove();
+					
+					_tnt.remove(tnt.getKey());
+					_tnt.put(newTNT, token);
+				}
+			}
+		}
+	}
+	
+	@EventHandler
+	public void blockCollision(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!IsLive())
+			return;
+		
+		for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
+		{
+			if (tnt.getKey() == null)
+				continue;
+			
+			if (!tnt.getKey().isValid())
+				continue;
+			
+			BombToken token = tnt.getValue();
+			Player thrower = UtilPlayer.searchExact(token.Thrower);
+			
+			if (thrower == null)
+				continue;
+			
+			if (!IsPlaying(thrower))
+				continue;
+			
+			if (!token.Primed)
+			{
+				//8+ insta explode
+				if (UtilTime.elapsed(token.Created, 8000))
+				{
+					token.Primed = true;
+					tnt.getKey().setFuseTicks(0);
+					continue;
+				}
+				else if (UtilTime.elapsed(token.Created, 3000))
+				{
+					for (Block block : UtilBlock.getSurrounding(tnt.getKey().getLocation().getBlock(), true))
+					{
+						if (block.getType() != Material.AIR)
+						{
+							token.Primed = true;
+							tnt.getKey().setFuseTicks(0);
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
 
 	@EventHandler
 	public void updateParticles(UpdateEvent event)
@@ -429,9 +514,23 @@ public class BombLobbers extends TeamGame implements IThrown
 	@Override
 	public void Collide(LivingEntity target, Block block, ProjectileUser data)
 	{
-		if (!(target instanceof Player) || !(data.GetThrower() instanceof Player))
+		if (!(data.GetThrown() instanceof TNTPrimed))
 			return;
 		
+		TNTPrimed tnt = (TNTPrimed) data.GetThrown();
+		
+		if (_tnt.containsKey(tnt))
+		{
+			_tnt.get(tnt).Primed = true;
+			tnt.setFuseTicks(0);
+		}
+		
+		if (!(data.GetThrower() instanceof Player))
+			return;
+
+		if (!(target instanceof Player))
+			return;
+
 		if (GetTeam((Player) target) == GetTeam((Player) data.GetThrower()))
 			return;
 			
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java
index eed18640a..a7eb4efd7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java
@@ -5,12 +5,16 @@ import org.bukkit.entity.Player;
 
 public class BombToken
 {
+	public final long Created;
 	public final String Thrower;
 	public Location A = null;
 	public Location B = null;
+	public boolean Primed = false;
 	
 	public BombToken(Player player)
 	{
 		Thrower = player.getName();
+		
+		Created = System.currentTimeMillis();
 	}
 }
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 b9184ad47..47ecd4222 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
@@ -28,7 +28,7 @@ public class KitArmorer extends Kit
 				C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
 				}, new Perk[]
 						{
-				new PerkCraftman(5000)
+				new PerkCraftman()
 						}, EntityType.ZOMBIE,
 				new ItemStack(Material.AIR));
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
index 304ccf255..bba5fd8e5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
@@ -1,18 +1,13 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
-import java.util.Map.Entry;
-
 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.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.game.games.lobbers.BombLobbers;
-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.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
@@ -20,31 +15,26 @@ import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
 
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.FixedMetadataValue;
 
 public class KitDetonator extends Kit
 {
-	private NautHashMap<TNTPrimed, Long> _respawnTimes = new NautHashMap<TNTPrimed, Long>();
-
 	public KitDetonator(ArcadeManager manager)
 	{
 		super(manager, "Detonator", KitAvailability.Gem, 4000, new String[]
 				{
 				"He doesn't like to wait. ",
-				C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Fuse Time.",
-				C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Fuse Time.",
-				"Maximum fuse time of " + C.cYellow + "6 Seconds.",
-				"Minimum fuse time of " + C.cYellow + "2 Seconds.",
+				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.",
 				}, new Perk[]
 						{
-				new PerkCraftman(6000)
+				new PerkCraftman()
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.LEVER).build());
 	}
@@ -52,7 +42,7 @@ public class KitDetonator extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).setAmount(3).build());
+		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).build());
 	}
 
 	@EventHandler
@@ -72,17 +62,12 @@ public class KitDetonator extends Kit
 		}
 		else
 		{
-			if (lever.getAmount() < 2 || lever.getAmount() > 6)
+			if (lever.getAmount() < 1 || lever.getAmount() > 3)
 			{
 				GiveItems(event.getPlayer());
 			}
-
-			event.getTNT().setFuseTicks(lever.getAmount() * 20);
 			
-			if (lever.getAmount() > 3)
-			{
-				_respawnTimes.put(event.getTNT(), System.currentTimeMillis() + 3000);
-			}
+			UtilAction.velocity(event.getTNT(), event.getPlayer().getLocation().getDirection(), lever.getAmount(), false, 0.0D, 0.1D, 10.0D, false);
 		}		
 	}
 	
@@ -106,70 +91,20 @@ public class KitDetonator extends Kit
 		//Right
 		if (UtilEvent.isAction(event, ActionType.R))
 		{
-			if (amount >= 6)
+			if (amount >= 3)
 				return;
 			
-			UtilInv.insert(event.getPlayer(), new ItemBuilder(Material.LEVER).setTitle(F.item("Fuse Selector (Seconds)")).build());
+			UtilInv.insert(event.getPlayer(), new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).build());
 			UtilInv.Update(event.getPlayer());
 		}
 		//Left
 		else if (UtilEvent.isAction(event, ActionType.L))
 		{
-			if (amount <= 2)
+			if (amount <= 1)
 				return;
 			
 			UtilInv.remove(event.getPlayer(), Material.LEVER, (byte) 0, 1);
 			UtilInv.Update(event.getPlayer());
 		}
-		event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.CLICK, 3.0F, 1.0F);
-	}
-	
-	@EventHandler
-	public void respawnBombs(UpdateEvent event)
-	{
-		if (!(Manager.GetGame() instanceof BombLobbers))
-			return;
-
-		BombLobbers l = (BombLobbers) Manager.GetGame();
-		
-		if (!Manager.GetGame().IsLive())
-			return;
-		
-		for (Entry<TNTPrimed, Long> entry : _respawnTimes.entrySet())
-		{
-			if (entry.getKey() == null || !entry.getKey().isValid())
-				return;
-			
-			//If it will need respawning
-			if (System.currentTimeMillis() >= entry.getValue())
-			{
-				Player player = l.getThrower(entry.getKey());
-
-				if (player == null)
-					continue;
-
-				TNTPrimed newTNT = entry.getKey().getWorld().spawn(entry.getKey().getLocation(), TNTPrimed.class);
-				newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
-				newTNT.setVelocity(entry.getKey().getVelocity());
-				newTNT.setFuseTicks(60);
-
-				Manager.GetProjectile().AddThrow(newTNT, player, l, -1L, true, false, true, .2F);
-
-				entry.getKey().remove();
-				l.removeThrower(entry.getKey());
-				_respawnTimes.remove(entry.getKey());
-
-				l.addThrower(player, newTNT);
-			}
-		}
-	}
-	
-	@EventHandler
-	public void onExplode(TNTPreExplodeEvent event)
-	{
-		if (_respawnTimes.containsKey(event.getTNT()))
-		{
-			_respawnTimes.remove(event.getTNT());
-		}
 	}
 }
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 20e73f9cd..ec0a9cbe7 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,6 +1,7 @@
 package nautilus.game.arcade.game.games.lobbers.kits;
 
 import mineplex.core.itemstack.ItemBuilder;
+import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
 import nautilus.game.arcade.kit.Kit;
@@ -10,8 +11,9 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump;
 
 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.event.entity.EntityDamageEvent.DamageCause;
 
 public class KitJumper extends Kit
 {
@@ -20,7 +22,8 @@ public class KitJumper extends Kit
 	{
 		super(manager, "Jumper", KitAvailability.Free, 0, new String[]
 				{
-				"Use your jumping abilities to leap away from trouble!"
+				"Use your jumping abilities to leap away from trouble!",
+				"You take no fall damage."
 				}, new Perk[]
 						{
 				new PerkDoubleJump("Double Jump", 1.2, 1.2, false, 6000, true),
@@ -33,11 +36,22 @@ public class KitJumper extends Kit
 	{
 
 	}
-	
-	@Override
-	public void SpawnCustom(LivingEntity ent)
+
+	@EventHandler
+	public void onDamage(CustomDamageEvent event)
 	{
-
+		if (!Manager.GetGame().IsLive())
+			return;
+		
+		if (!(event.GetDamageeEntity() instanceof Player))
+			return;
+		
+		if (!HasKit(event.GetDamageePlayer()))
+			return;
+			
+		if (event.GetCause() == DamageCause.FALL)
+		{
+			event.SetCancelled("Jumper no fall damage");
+		}
 	}
-
-}
\ No newline at end of file
+}
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 7d9d760e8..022fb8b75 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
@@ -24,7 +24,7 @@ public class KitWaller extends Kit
 				}, new Perk[]
 						{
 				new PerkWaller(),
-				new PerkCraftman(6000)
+				new PerkCraftman()
 						}, EntityType.ZOMBIE,
 				new ItemBuilder(Material.SMOOTH_BRICK).setUnbreakable(true).build());
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index 9373d293b..9c1e6fc8a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -16,23 +16,15 @@ import org.bukkit.event.EventHandler;
 public class PerkCraftman extends Perk
 {
 	private Recharge _recharge;
-	
-	private final long _giveTime;
-	
+		
 	public PerkCraftman()
-	{
-		this(4000);
-	}
-	
-	public PerkCraftman(long giveTime)
 	{
 		super("Craftman", new String[]
 				{
-				C.cGray + "Recieve 1 TNT every " + C.cYellow + giveTime / 1000 + " Seconds." + C.cGray + " Maximum of 3."
+				C.cGray + "Recieve 1 TNT every so often. Maximum of 3."
 				});
 		
 		_recharge = Recharge.Instance;
-		_giveTime = giveTime;
 	}
 	
 	@EventHandler
@@ -49,7 +41,7 @@ public class PerkCraftman extends Perk
 			if (!Kit.HasKit(player))
 				continue;
 			
-			if (!_recharge.use(player, "Bomb Give", _giveTime, false, false))
+			if (!_recharge.use(player, "Bomb Give", (long) (1000 * (8 - Math.floor(Manager.GetGame().getGameLiveTime() / 20))), false, false))
 				continue;
 			
 			//Has 3
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
index e79aaefff..db295ff13 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java
@@ -72,7 +72,7 @@ public class PerkMortar extends Perk
 
 		player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
 		
-		l.addThrower(player, tnt);
+//		l.addThrower(player, tnt);
 	}
 	
 	@EventHandler
@@ -109,7 +109,7 @@ public class PerkMortar extends Perk
 			UtilAction.velocity(tnt, event.getTNT().getVelocity().add(new Vector(i / 5, 0, i / 5)).normalize(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
 			Manager.GetProjectile().AddThrow(tnt, event.getPlayer(), l, -1L, true, false, false, .2F);
 			
-			l.addThrower(event.getPlayer(), tnt);
+//			l.addThrower(event.getPlayer(), tnt);
 			_scatter.add(tnt);
 		}
 	}

From d295cead09e3b752bb758ff7a63983d024005be4 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 04:18:18 -0400
Subject: [PATCH 41/70] Final stuff

---
 .../game/games/lobbers/BombLobbers.java       | 35 ++++++++++---------
 .../{KitDetonator.java => KitPitcher.java}    | 24 +++++++++----
 .../lobbers/kits/perks/PerkCraftman.java      | 26 ++++++++++++--
 .../games/lobbers/kits/perks/PerkWaller.java  | 21 -----------
 4 files changed, 60 insertions(+), 46 deletions(-)
 rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/{KitDetonator.java => KitPitcher.java} (84%)

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 96bef6555..ce716f561 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
@@ -24,6 +24,7 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.combat.CombatComponent;
 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;
@@ -32,7 +33,7 @@ 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.KitDetonator;
+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.KitWaller;
 import nautilus.game.arcade.game.games.lobbers.trackers.Tracker6Kill;
@@ -43,7 +44,6 @@ import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
 import nautilus.game.arcade.kit.Kit;
 
 import org.bukkit.ChatColor;
-import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -52,6 +52,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -72,7 +73,7 @@ public class BombLobbers extends TeamGame implements IThrown
 				{
 				new KitJumper(manager),
 				new KitArmorer(manager),
-				new KitDetonator(manager),
+				new KitPitcher(manager),
 //				new KitMortar(manager), << Spare time kit for Bobbeh
 				new KitWaller(manager)
 				}, new String[]
@@ -289,8 +290,11 @@ public class BombLobbers extends TeamGame implements IThrown
 		if (!IsLive())
 			return;
 		
-		for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
+		Iterator<Entry<TNTPrimed, BombToken>> iterator = _tnt.entrySet().iterator();
+		while (iterator.hasNext())
 		{
+			Entry<TNTPrimed, BombToken> tnt = iterator.next();
+			
 			if (tnt.getKey() == null)
 				continue;
 			
@@ -516,15 +520,7 @@ public class BombLobbers extends TeamGame implements IThrown
 	{
 		if (!(data.GetThrown() instanceof TNTPrimed))
 			return;
-		
-		TNTPrimed tnt = (TNTPrimed) data.GetThrown();
-		
-		if (_tnt.containsKey(tnt))
-		{
-			_tnt.get(tnt).Primed = true;
-			tnt.setFuseTicks(0);
-		}
-		
+				
 		if (!(data.GetThrower() instanceof Player))
 			return;
 
@@ -537,10 +533,9 @@ public class BombLobbers extends TeamGame implements IThrown
 		data.GetThrown().setVelocity(new Vector());
 		
 		if (target != null)
-		{
 			UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown().getLocation(), target.getLocation()), .2, false, 0, 0.2, .4, true);
-			target.playEffect(EntityEffect.HURT);
-		}
+		
+		Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null, DamageCause.PROJECTILE, 6.0, false, false, true, "Throwing TNT", "Throwing TNT Direct Hit");
 	}
 
 	@Override
@@ -554,4 +549,12 @@ public class BombLobbers extends TeamGame implements IThrown
 	{
 		
 	}
+	
+	public void knockbackIncrease(CustomDamageEvent event)
+	{
+		if (event.GetCause() != DamageCause.ENTITY_EXPLOSION && event.GetCause() != DamageCause.BLOCK_EXPLOSION)
+			return;
+
+		event.AddKnockback("Explosion", 1.5D);
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
similarity index 84%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
index bba5fd8e5..8e69a8499 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitDetonator.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java
@@ -21,13 +21,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class KitDetonator extends Kit
+public class KitPitcher extends Kit
 {
-	public KitDetonator(ArcadeManager manager)
+	public KitPitcher(ArcadeManager manager)
 	{
-		super(manager, "Detonator", KitAvailability.Gem, 4000, new String[]
+		super(manager, "Pitcher", KitAvailability.Gem, 4000, new String[]
 				{
-				"He doesn't like to wait. ",
+				"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.",
@@ -42,7 +43,7 @@ public class KitDetonator extends Kit
 	@Override
 	public void GiveItems(Player player)
 	{
-		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).build());
+		player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).setAmount(3).build());
 	}
 
 	@EventHandler
@@ -67,7 +68,7 @@ public class KitDetonator extends Kit
 				GiveItems(event.getPlayer());
 			}
 			
-			UtilAction.velocity(event.getTNT(), event.getPlayer().getLocation().getDirection(), lever.getAmount(), false, 0.0D, 0.1D, 10.0D, false);
+			UtilAction.velocity(event.getTNT(), event.getPlayer().getLocation().getDirection(), getVelocity(lever.getAmount()), false, 0.0D, 0.1D, 10.0D, false);
 		}		
 	}
 	
@@ -107,4 +108,15 @@ public class KitDetonator extends Kit
 			UtilInv.Update(event.getPlayer());
 		}
 	}
+
+	private double getVelocity(int amount)
+	{
+		if (amount == 1)
+			return 1.5;
+		
+		if (amount == 2)
+			return 1.75;
+		
+		return 2.0;
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
index 9c1e6fc8a..7e89b427f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java
@@ -22,7 +22,7 @@ public class PerkCraftman extends Perk
 		super("Craftman", new String[]
 				{
 				C.cGray + "Recieve 1 TNT every so often. Maximum of 3."
-				});
+				}, false);
 		
 		_recharge = Recharge.Instance;
 	}
@@ -40,8 +40,9 @@ public class PerkCraftman extends Perk
 		{
 			if (!Kit.HasKit(player))
 				continue;
-			
-			if (!_recharge.use(player, "Bomb Give", (long) (1000 * (8 - Math.floor(Manager.GetGame().getGameLiveTime() / 20))), false, false))
+			//If game time is 56 seconds - 56000
+			//8 - 1
+			if (!_recharge.use(player, "Bomb Give", getRechargeTime(), false, false))
 				continue;
 			
 			//Has 3
@@ -51,4 +52,23 @@ public class PerkCraftman extends Perk
 			UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(F.item("Throwing TNT")).build());
 		}
 	}
+	
+	private long getRechargeTime()
+	{
+		long ingame = Manager.GetGame().getGameLiveTime();
+		
+		if (ingame <= 20000)
+			return 8000;
+		
+		if (ingame <= 40000)
+			return 7000;
+		
+		if (ingame <= 60000)
+			return 6000;
+		
+		if (ingame <= 620000)
+			return 5000;
+		
+		return 4000;
+	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index 7f696aa22..afb0e8b47 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -77,27 +77,6 @@ public class PerkWaller extends Perk
 		_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw()));
 	}
 	
-	@EventHandler
-	public void explodeTNT(UpdateEvent event)
-	{
-		if (!Manager.GetGame().IsLive())
-			return;	
-	
-		if (event.getType() != UpdateType.FAST)
-			return;
-		
-		for (TNTPrimed tnt : _tnt)
-		{
-			for (Block near : UtilBlock.getInRadius(tnt.getLocation(), 3.0F).keySet())
-			{
-				if (_wallBlocks.contains(near.getLocation()))
-				{
-					tnt.setFuseTicks(0);
-				}
-			}
-		}
-	}
-	
 	@SuppressWarnings("deprecation")
 	private Set<Location> buildWall(final Location source, final float playerYaw)
 	{

From 84be48f2648869a3c468cba2f8c3412f2d135cbb Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sat, 25 Jul 2015 01:30:50 -0700
Subject: [PATCH 42/70] Updated MiniDbClientPlugin to include accountId in the
 processLoginResultSet method.

Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
---
 .../src/mineplex/core/MiniDbClientPlugin.java |   2 +-
 .../core/account/ILoginProcessor.java         |   2 +-
 .../account/repository/AccountRepository.java |   2 +-
 .../core/achievement/Achievement.java         |   2 +-
 .../core/achievement/AchievementData.java     |  10 +-
 .../core/achievement/AchievementLog.java      |   4 +-
 .../mineplex/core/benefit/BenefitManager.java |   2 +-
 .../core/donation/DonationManager.java        |   2 +-
 .../src/mineplex/core/elo/EloManager.java     |   2 +-
 .../mineplex/core/friend/FriendManager.java   |   2 +-
 .../mineplex/core/ignore/IgnoreManager.java   |   2 +-
 .../core/inventory/InventoryManager.java      |   2 +-
 .../core/preferences/PreferencesManager.java  |   2 +-
 .../src/mineplex/core/stats/PlayerStats.java  |  10 +-
 .../core/stats/SecondaryStatHandler.java      |  99 +++++
 .../src/mineplex/core/stats/StatsManager.java |  37 +-
 .../mineplex/core/stats/StatsRepository.java  |  26 +-
 .../core/stats/command/GiveStatCommand.java   |   2 +-
 .../core/stats/command/TimeCommand.java       |   4 +-
 .../core/stats/event/StatChangeEvent.java     |  10 +-
 .../src/mineplex/core/task/TaskManager.java   |   2 +-
 .../src/mineplex/database/Account.java        |   5 +-
 .../src/mineplex/database/Keys.java           |  18 +
 .../src/mineplex/database/Routines.java       |  41 +-
 .../src/mineplex/database/Tables.java         |  15 +
 .../database/routines/AccountGoldChange.java  |  67 ++++
 .../database/routines/Check_daily.java        |  26 +-
 .../database/routines/Check_rank.java         |  93 +++++
 .../mineplex/database/routines/TestPro.java   |  41 ++
 .../mineplex/database/tables/AccountStat.java | 109 ++++++
 .../src/mineplex/database/tables/Bonus.java   |   4 +-
 .../src/mineplex/database/tables/Clans.java   |  27 +-
 .../src/mineplex/database/tables/Mailbox.java | 137 +++++++
 .../database/tables/RankBenefits.java         | 117 ++++++
 .../tables/records/AccountStatRecord.java     | 199 ++++++++++
 .../database/tables/records/BonusRecord.java  |  24 +-
 .../database/tables/records/ClansRecord.java  | 218 ++++++++++-
 .../tables/records/MailboxRecord.java         | 359 ++++++++++++++++++
 .../tables/records/RankBenefitsRecord.java    | 199 ++++++++++
 .../src/mineplex/hub/HubRepository.java       |  27 --
 .../src/mineplex/hub/modules/NewsManager.java |   2 +-
 .../src/mineplex/hub/poll/PollManager.java    |   4 +-
 .../command/GemHunterCommand.java             |   2 +-
 43 files changed, 1830 insertions(+), 130 deletions(-)
 create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/routines/TestPro.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.java
 create mode 100644 Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java
index 92e2ea3cb..2f479adeb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java
@@ -21,7 +21,7 @@ public abstract class MiniDbClientPlugin<DataType extends Object> extends MiniCl
 		clientManager.addStoredProcedureLoginProcessor(this);
 	}
 
-	public abstract void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
+	public abstract void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
 	
 	public CoreClientManager getClientManager()
 	{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
index aca0eb341..2f278165b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
@@ -7,7 +7,7 @@ public interface ILoginProcessor
 {
 	String getName();
 	
-	void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
+	void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
 
 	String getQuery(int accountId, String uuid, String name);
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
index 954f3eaa9..60f756748 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
@@ -142,7 +142,7 @@ public class AccountRepository extends RepositoryBase
 			
 			for (ILoginProcessor loginProcessor : loginProcessors.values())
 			{
-				loginProcessor.processLoginResultSet(name, statement.getResultSet());
+				loginProcessor.processLoginResultSet(name, accountId, statement.getResultSet());
 				statement.getMoreResults();
 			}
 		}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
index a1d818cca..8bbb530e2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
@@ -754,7 +754,7 @@ public enum Achievement
 		return _category;
 	}
 
-	public AchievementData getLevelData(int exp)
+	public AchievementData getLevelData(long exp)
 	{
 		for (int i = 0; i < _levels.length; i++)
 		{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
index 41e9562a2..5f1f617fd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
@@ -3,10 +3,10 @@ package mineplex.core.achievement;
 public class AchievementData
 {
 	private int _level;
-	private int _expRemainder;
-	private int _expNextLevel;
+	private long _expRemainder;
+	private long _expNextLevel;
 	
-	public AchievementData(int level, int expRemainder, int expNextLevel)
+	public AchievementData(int level, long expRemainder, long expNextLevel)
 	{
 		_level = level;
 		_expRemainder = expRemainder;
@@ -18,12 +18,12 @@ public class AchievementData
 		return _level;
 	}
 	
-	public int getExpRemainder()
+	public long getExpRemainder()
 	{
 		return _expRemainder;
 	}
 	
-	public int getExpNextLevel()
+	public long getExpNextLevel()
 	{
 		return _expNextLevel;
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java
index 6d6e37f91..1684c162f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java
@@ -2,10 +2,10 @@ package mineplex.core.achievement;
 
 public class AchievementLog
 {
-	public int Amount;
+	public long Amount;
 	public boolean LevelUp;
 	
-	public AchievementLog(int amount, boolean levelUp)
+	public AchievementLog(long amount, boolean levelUp)
 	{
 		Amount = amount;
 		LevelUp = levelUp;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
index 973950020..0301e0225 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
@@ -73,7 +73,7 @@ public class BenefitManager extends MiniDbClientPlugin<BenefitData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.retrievePlayerBenefitData(resultSet));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
index 5b4ca0932..aaad37d68 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
@@ -386,7 +386,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
 	}
 	
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Get(playerName).addGold(_repository.retrieveDonorInfo(resultSet).getGold());
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
index 01f927d39..d1c44b6d6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
@@ -108,7 +108,7 @@ public class EloManager extends MiniDbClientPlugin<EloClientData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
index c25fec865..cafd20ec9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
@@ -401,7 +401,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
     }
 
     @Override
-    public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+    public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
     {
         Set(playerName, _repository.loadClientInformation(resultSet));
     }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
index 7edaa801f..e7b8732c1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
@@ -230,7 +230,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
     }
 
     @Override
-    public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+    public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
     {
         Set(playerName, _repository.loadClientInformation(resultSet));
     }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
index 2cb728e5c..8c87db300 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
@@ -251,7 +251,7 @@ public class InventoryManager extends MiniDbClientPlugin<ClientInventory>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
index b24e700ba..6a96dcd16 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
@@ -106,7 +106,7 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java
index 02b67752a..b5caa1745 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java
@@ -6,13 +6,13 @@ import mineplex.core.common.util.NautHashMap;
 
 public class PlayerStats 
 {
-	private NautHashMap<String, Integer> _statHash = new NautHashMap<String, Integer>();
+	private NautHashMap<String, Long> _statHash = new NautHashMap<String,Long>();
 	
-	public int addStat(String statName, int value)
+	public long addStat(String statName, long value)
 	{
 		if (!_statHash.containsKey(statName))
 		{
-			_statHash.put(statName, 0);
+			_statHash.put(statName, 0L);
 		}
 		
 		_statHash.put(statName, _statHash.get(statName) + value);
@@ -20,9 +20,9 @@ public class PlayerStats
 		return _statHash.get(statName);
 	}
 
-	public int getStat(String statName) 
+	public long getStat(String statName) 
 	{
-		return _statHash.containsKey(statName) ? _statHash.get(statName) : 0;
+		return _statHash.containsKey(statName) ? _statHash.get(statName) : 0L;
 	}
 
 	public Set<String> getStatsNames() 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
new file mode 100644
index 000000000..1aa39a19c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
@@ -0,0 +1,99 @@
+package mineplex.core.stats;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jooq.Configuration;
+import org.jooq.DSLContext;
+import org.jooq.Delete;
+import org.jooq.Insert;
+import org.jooq.SQLDialect;
+import org.jooq.TransactionalRunnable;
+import org.jooq.Update;
+import org.jooq.impl.DSL;
+
+import mineplex.core.account.ILoginProcessor;
+import mineplex.core.database.DBPool;
+import mineplex.database.Tables;
+
+public class SecondaryStatHandler implements ILoginProcessor
+{
+	private StatsManager _statsManager;
+	private StatsRepository _repository;
+	
+	public SecondaryStatHandler(StatsManager statsManager, StatsRepository repository)
+	{
+		_statsManager = statsManager;
+		_repository = repository;
+	}
+
+	@Override
+	public String getName()
+	{
+		return "Secondary Stat Handler";
+	}
+
+	@Override
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
+	{
+		PlayerStats oldPlayerStats = _statsManager.Get(playerName);
+		PlayerStats newPlayerStats = _repository.loadClientInformation(resultSet);
+		
+		if (newPlayerStats.getStatsNames().size() == 0 && oldPlayerStats.getStatsNames().size() != 0)
+		{
+			try
+			{
+				DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
+
+				final List<Insert> inserts = new ArrayList<>();
+				final List<Delete> deletes = new ArrayList<>();
+
+				for (String statName : oldPlayerStats.getStatsNames())
+				{
+					Integer statId = _statsManager.getStatId(statName);
+
+					Insert insert = context
+							.insertInto(Tables.accountStat)
+							.set(Tables.accountStat.accountId, accountId)
+							.set(Tables.accountStat.statId, statId)
+							.set(Tables.accountStat.value, oldPlayerStats.getStat(statName));
+
+					inserts.add(insert);
+					
+					Delete delete = context.delete(Tables.accountStats)
+								.where(Tables.accountStats.accountId.equal(accountId));
+					
+					deletes.add(delete);
+				}
+				
+				context.transaction(new TransactionalRunnable()
+				{
+					@Override
+					public void run(Configuration config) throws Exception
+					{
+						DSL.using(config).batch(inserts).execute();
+						DSL.using(config).batch(deletes).execute();
+					}
+				});
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+		else
+		{
+			_statsManager.replacePlayerHack(playerName, newPlayerStats);
+		}
+	}
+
+	@Override
+	public String getQuery(int accountId, String uuid, String name)
+	{
+		return "SELECT stats.name, value FROM accountStat INNER JOIN stats ON stats.id = accountStat.statId WHERE accountStat.accountId = '" + accountId + "';";
+	}
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
index 8ab29b11d..16d079282 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
@@ -9,7 +9,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import mineplex.core.MiniDbClientPlugin;
-import mineplex.core.account.CoreClient;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilServer;
@@ -24,7 +23,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 	private StatsRepository _repository;
 	
 	private NautHashMap<String, Integer> _stats = new NautHashMap<String, Integer>();
-	private NautHashMap<Player, NautHashMap<String, Integer>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Integer>>();
+	private NautHashMap<Player, NautHashMap<String, Long>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Long>>();
 	private Runnable _saveRunnable;
 	
 	public StatsManager(JavaPlugin plugin, CoreClientManager clientManager) 
@@ -50,11 +49,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		{
 			_stats.put(stat.Name, stat.Id);
 		}
+		
+		clientManager.addStoredProcedureLoginProcessor(new SecondaryStatHandler(this, _repository));
 	}
 	
-	public void incrementStat(final Player player, final String statName, final int value)
+	public void incrementStat(final Player player, final String statName, final long value)
 	{
-		int newValue = Get(player).addStat(statName, value);
+		long newValue = Get(player).addStat(statName, value);
 
 		//Event
 		UtilServer.getServer().getPluginManager().callEvent(new StatChangeEvent(player.getName(), statName, newValue - value, newValue));
@@ -97,15 +98,15 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		}
 	}
 	
-	private void addToQueue(String statName, Player player, int value)
+	private void addToQueue(String statName, Player player, long value)
 	{
 		synchronized (_statSync)
 		{
 			if (!_statUploadQueue.containsKey(player))
-				_statUploadQueue.put(player, new NautHashMap<String, Integer>());
+				_statUploadQueue.put(player, new NautHashMap<String, Long>());
 			
 			if (!_statUploadQueue.get(player).containsKey(statName))
-				_statUploadQueue.get(player).put(statName, 0);
+				_statUploadQueue.get(player).put(statName, 0L);
 			
 			_statUploadQueue.get(player).put(statName, _statUploadQueue.get(player).get(statName) + value);
 		}
@@ -118,7 +119,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		
 		try
 		{
-			NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
+			NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
 			
 			synchronized (_statSync)
 			{
@@ -131,7 +132,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 					
 					int uploadKey = ClientManager.getCachedClientAccountId(player.getUniqueId());
 					
-					uploadQueue.put(uploadKey, new NautHashMap<Integer, Integer>());
+					uploadQueue.put(uploadKey, new NautHashMap<Integer, Long>());
 					
 					for (String statName : _statUploadQueue.get(player).keySet())
 					{
@@ -152,13 +153,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		}
 	}
 
-	public boolean incrementStat(final int accountId, final String statName, final int value)
+	public boolean incrementStat(final int accountId, final String statName, final long value)
 	{
 		if (_stats.containsKey(statName))
 			return false;
 		
-		final NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
-		uploadQueue.put(accountId, new NautHashMap<Integer, Integer>());
+		final NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
+		uploadQueue.put(accountId, new NautHashMap<Integer, Long>());
 		uploadQueue.get(accountId).put(_stats.get(statName), value);
 		
 		runAsync(new Runnable()
@@ -172,6 +173,16 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 		return true;
 	}
 	
+	public int getStatId(String statName)
+	{
+		return _stats.get(statName);
+	}
+	
+	public void replacePlayerHack(String playerName, PlayerStats playerStats)
+	{
+		Set(playerName, playerStats);
+	}
+	
 	@Override
 	protected PlayerStats AddPlayer(String player)
 	{
@@ -191,7 +202,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
index 23d3daa9d..683cca93d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
@@ -77,7 +77,7 @@ public class StatsRepository extends RepositoryBase
 	}
 
 	@SuppressWarnings("rawtypes")
-	public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue)
+	public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue)
 	{
 		try
 		{
@@ -91,18 +91,18 @@ public class StatsRepository extends RepositoryBase
 				for (Integer statId : uploadQueue.get(accountId).keySet())
 				{
 					Update update = context
-							.update(Tables.accountStats)
-							.set(Tables.accountStats.value, Tables.accountStats.value.plus(uploadQueue.get(accountId).get(statId)))
-							.where(Tables.accountStats.accountId.eq(accountId))
-							.and(Tables.accountStats.statId.eq(statId));
+							.update(Tables.accountStat)
+							.set(Tables.accountStat.value, Tables.accountStat.value.plus(uploadQueue.get(accountId).get(statId)))
+							.where(Tables.accountStat.accountId.eq(accountId))
+							.and(Tables.accountStat.statId.eq(statId));
 
 					updates.add(update);
 
 					Insert insert = context
-							.insertInto(Tables.accountStats)
-							.set(Tables.accountStats.accountId, accountId)
-							.set(Tables.accountStats.statId, statId)
-							.set(Tables.accountStats.value, uploadQueue.get(accountId).get(statId));
+							.insertInto(Tables.accountStat)
+							.set(Tables.accountStat.accountId, accountId)
+							.set(Tables.accountStat.statId, statId)
+							.set(Tables.accountStat.value, uploadQueue.get(accountId).get(statId));
 
 					inserts.add(insert);
 				}
@@ -137,10 +137,10 @@ public class StatsRepository extends RepositoryBase
 			context = DSL.using(getConnectionPool(), SQLDialect.MYSQL);
 		}
 
-		Result<Record2<String, Integer>> result = context.select(Tables.stats.name, Tables.accountStats.value).from(Tables.accountStats)
+		Result<Record2<String, Long>> result = context.select(Tables.stats.name, Tables.accountStat.value).from(Tables.accountStat)
 				.join(Tables.stats)
-				.on(Tables.stats.id.eq(Tables.accountStats.statId))
-				.where(Tables.accountStats.accountId.eq(DSL.select(Tables.accounts.id)
+				.on(Tables.stats.id.eq(Tables.accountStat.statId))
+				.where(Tables.accountStat.accountId.eq(DSL.select(Tables.accounts.id)
 						.from(Tables.accounts)
 						.where(Tables.accounts.name.eq(playerName)))
 				).fetch();
@@ -149,7 +149,7 @@ public class StatsRepository extends RepositoryBase
 		if (result.isNotEmpty())
 		{
 			playerStats = new PlayerStats();
-			for (Record2<String, Integer> record : result)
+			for (Record2<String, Long> record : result)
 			{
 				playerStats.addStat(record.value1(), record.value2());
 			}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java
index 35293a2b5..60212f1d0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java
@@ -47,7 +47,7 @@ public class GiveStatCommand extends CommandBase<StatsManager>
 						final CoreClient client = Plugin.getClientManager().Get(args[0]);
 						
 						if (client != null)
-							Plugin.incrementStat(client.getAccountId(), statName, Integer.parseInt(args[args.length - 1]));
+							Plugin.incrementStat(client.getAccountId(), statName, Long.parseLong(args[args.length - 1]));
 						else
 							caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + args[0] + "'s account!"));
 					}
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..2754465d8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
@@ -55,7 +55,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 									}
 									else
 									{
-										int time = stats.getStat("Global.TimeInGame");
+										long time = stats.getStat("Global.TimeInGame");
 										UtilPlayer.message(caller, F.main("Time", F.name(args[0]) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
 									}
 								}
@@ -70,7 +70,7 @@ public class TimeCommand extends CommandBase<StatsManager>
 			}
 			else
 			{
-				int time = Plugin.Get(target).getStat("Global.TimeInGame");
+				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")));
 			}
 		}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java
index ec1c230f1..2dc93919f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java
@@ -11,10 +11,10 @@ public class StatChangeEvent extends Event
     
     private String _player;
     private String _statName;
-    private int _valueBefore;
-    private int _valueAfter;
+    private long _valueBefore;
+    private long _valueAfter;
     
-    public StatChangeEvent(String player, String statName, int valueBefore, int valueAfter)
+    public StatChangeEvent(String player, String statName, long valueBefore, long valueAfter)
     {
        _player = player;
        _statName = statName;
@@ -42,12 +42,12 @@ public class StatChangeEvent extends Event
     	return _statName;
     }
     
-    public int getValueBefore()
+    public long getValueBefore()
     {
     	return _valueBefore;
     }
     
-    public int getValueAfter()
+    public long getValueAfter()
     {
     	return _valueAfter;
     }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
index fc9e67158..2ecce2580 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
@@ -134,7 +134,7 @@ public class TaskManager extends MiniDbClientPlugin<TaskClient>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadClientInformation(resultSet));
 	}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Account.java b/Plugins/Mineplex.Database/src/mineplex/database/Account.java
index dbbc64d17..9e66bafa8 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 = -478529995;
+	private static final long serialVersionUID = 625106486;
 
 	/**
 	 * The reference instance of <code>Account</code>
@@ -48,6 +48,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.AccountPolls.accountPolls,
 			mineplex.database.tables.AccountPreferences.accountPreferences,
 			mineplex.database.tables.Accounts.accounts,
+			mineplex.database.tables.AccountStat.accountStat,
 			mineplex.database.tables.AccountStats.accountStats,
 			mineplex.database.tables.AccountTasks.accountTasks,
 			mineplex.database.tables.AccountTransactions.accountTransactions,
@@ -67,9 +68,11 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.ItemCategories.itemCategories,
 			mineplex.database.tables.Items.items,
 			mineplex.database.tables.Mail.mail,
+			mineplex.database.tables.Mailbox.mailbox,
 			mineplex.database.tables.Npcs.npcs,
 			mineplex.database.tables.PlayerMap.playerMap,
 			mineplex.database.tables.Polls.polls,
+			mineplex.database.tables.RankBenefits.rankBenefits,
 			mineplex.database.tables.ServerPassword.serverPassword,
 			mineplex.database.tables.Spawns.spawns,
 			mineplex.database.tables.StatEvents.statEvents,
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
index 5b882d388..4eb24c54d 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Keys.java
@@ -47,9 +47,11 @@ public class Keys {
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = Identities0.IDENTITY_items;
 	public static final org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = Identities0.IDENTITY_mail;
+	public static final org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = Identities0.IDENTITY_mailbox;
 	public static final org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = Identities0.IDENTITY_npcs;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = Identities0.IDENTITY_playerMap;
 	public static final org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = Identities0.IDENTITY_polls;
+	public static final org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = Identities0.IDENTITY_rankBenefits;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = Identities0.IDENTITY_serverPassword;
 	public static final org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = Identities0.IDENTITY_spawns;
 	public static final org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = Identities0.IDENTITY_statEvents;
@@ -75,6 +77,7 @@ public class Keys {
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = UniqueKeys0.KEY_accountPreferences_uuid_index;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = UniqueKeys0.KEY_accounts_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = UniqueKeys0.KEY_accountStat_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = UniqueKeys0.KEY_accountTasks_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY;
@@ -101,10 +104,12 @@ public class Keys {
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = UniqueKeys0.KEY_items_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = UniqueKeys0.KEY_items_uniqueNameCategoryIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = UniqueKeys0.KEY_mail_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = UniqueKeys0.KEY_mailbox_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = UniqueKeys0.KEY_npcs_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = UniqueKeys0.KEY_playerMap_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = UniqueKeys0.KEY_playerMap_playerIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = UniqueKeys0.KEY_polls_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = UniqueKeys0.KEY_serverPassword_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = UniqueKeys0.KEY_spawns_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = UniqueKeys0.KEY_statEvents_PRIMARY;
@@ -131,6 +136,8 @@ public class Keys {
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = ForeignKeys0.accountPolls_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = ForeignKeys0.accountStat_account;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = ForeignKeys0.accountStat_stat;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = ForeignKeys0.accountStats_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = ForeignKeys0.accountStats_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = ForeignKeys0.ACCOUNTTASKS_ACCOUNTID;
@@ -147,6 +154,8 @@ public class Keys {
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = ForeignKeys0.clanTerritory_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = ForeignKeys0.items_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = ForeignKeys0.mail_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = ForeignKeys0.mailbox_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = ForeignKeys0.rankBenefits_ibfk_1;
 
 	// -------------------------------------------------------------------------
 	// [#1459] distribute members to avoid static initialisers > 64kb
@@ -179,9 +188,11 @@ public class Keys {
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = createIdentity(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = createIdentity(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = createIdentity(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = createIdentity(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = createIdentity(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = createIdentity(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = createIdentity(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = createIdentity(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = createIdentity(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = createIdentity(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = createIdentity(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@@ -205,6 +216,7 @@ public class Keys {
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = createUniqueKey(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.uuid);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.uuid);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId, mineplex.database.tables.AccountStat.accountStat.statId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
 		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);
@@ -231,10 +243,12 @@ public class Keys {
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name, mineplex.database.tables.Items.items.categoryId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = createUniqueKey(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = createUniqueKey(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = createUniqueKey(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.playerName);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = createUniqueKey(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = createUniqueKey(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = createUniqueKey(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = createUniqueKey(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@@ -259,6 +273,8 @@ public class Keys {
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_polls_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.pollId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.statId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.statId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.accountId);
@@ -275,5 +291,7 @@ public class Keys {
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_itemCategories_PRIMARY, mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.categoryId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.accountId);
 	}
 }
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
index 1e81aaa0b..21ae7415e 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Routines.java
@@ -16,14 +16,39 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Routines {
 
+	/**
+	 * Call <code>Account.accountGoldChange</code>
+	 */
+	public static java.lang.Byte callAccountgoldchange(org.jooq.Configuration configuration, java.lang.Integer accountId, java.lang.Integer goldChange) {
+		mineplex.database.routines.AccountGoldChange p = new mineplex.database.routines.AccountGoldChange();
+		p.setAccountId(accountId);
+		p.setGoldChange(goldChange);
+
+		p.execute(configuration);
+		return p.getSuccess();
+	}
+
 	/**
 	 * Call <code>Account.check_daily</code>
 	 */
-	public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coins_change, java.lang.Integer gems_change) {
+	public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
 		mineplex.database.routines.Check_daily p = new mineplex.database.routines.Check_daily();
 		p.setAccountId_in(accountId_in);
-		p.setCoins_change(coins_change);
-		p.setGems_change(gems_change);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
+
+		p.execute(configuration);
+		return p;
+	}
+
+	/**
+	 * Call <code>Account.check_rank</code>
+	 */
+	public static mineplex.database.routines.Check_rank callCheckRank(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
+		mineplex.database.routines.Check_rank p = new mineplex.database.routines.Check_rank();
+		p.setAccountId_in(accountId_in);
+		p.setCoinsChange(coinsChange);
+		p.setGemsChange(gemsChange);
 
 		p.execute(configuration);
 		return p;
@@ -117,6 +142,16 @@ public class Routines {
 		p.execute(configuration);
 	}
 
+	/**
+	 * Call <code>Account.testPro</code>
+	 */
+	public static java.sql.Date callTestpro(org.jooq.Configuration configuration) {
+		mineplex.database.routines.TestPro p = new mineplex.database.routines.TestPro();
+
+		p.execute(configuration);
+		return p.getVar();
+	}
+
 	/**
 	 * Call <code>Account.updateTournament</code>
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
index 34b62d652..36f9b2e67 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/Tables.java
@@ -61,6 +61,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Accounts accounts = mineplex.database.tables.Accounts.accounts;
 
+	/**
+	 * The table Account.accountStat
+	 */
+	public static final mineplex.database.tables.AccountStat accountStat = mineplex.database.tables.AccountStat.accountStat;
+
 	/**
 	 * The table Account.accountStats
 	 */
@@ -156,6 +161,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Mail mail = mineplex.database.tables.Mail.mail;
 
+	/**
+	 * The table Account.mailbox
+	 */
+	public static final mineplex.database.tables.Mailbox mailbox = mineplex.database.tables.Mailbox.mailbox;
+
 	/**
 	 * The table Account.npcs
 	 */
@@ -171,6 +181,11 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.Polls polls = mineplex.database.tables.Polls.polls;
 
+	/**
+	 * The table Account.rankBenefits
+	 */
+	public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits;
+
 	/**
 	 * The table Account.serverPassword
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java
new file mode 100644
index 000000000..40c4a7dd5
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java
@@ -0,0 +1,67 @@
+/**
+ * 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 AccountGoldChange extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 360483639;
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.accountId</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> accountId = createParameter("accountId", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.goldChange</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Integer> goldChange = createParameter("goldChange", org.jooq.impl.SQLDataType.INTEGER, false);
+
+	/**
+	 * The parameter <code>Account.accountGoldChange.success</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.Byte> success = createParameter("success", org.jooq.impl.SQLDataType.TINYINT, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public AccountGoldChange() {
+		super("accountGoldChange", mineplex.database.Account.Account);
+
+		addInParameter(accountId);
+		addInParameter(goldChange);
+		addOutParameter(success);
+	}
+
+	/**
+	 * Set the <code>accountId</code> parameter IN value to the routine
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(mineplex.database.routines.AccountGoldChange.accountId, value);
+	}
+
+	/**
+	 * Set the <code>goldChange</code> parameter IN value to the routine
+	 */
+	public void setGoldChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.AccountGoldChange.goldChange, value);
+	}
+
+	/**
+	 * Get the <code>success</code> parameter OUT value from the routine
+	 */
+	public java.lang.Byte getSuccess() {
+		return getValue(success);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java
index ab68749e8..a7846d168 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java
@@ -16,7 +16,7 @@ package mineplex.database.routines;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1106680609;
+	private static final long serialVersionUID = -1266580733;
 
 	/**
 	 * The parameter <code>Account.check_daily.accountId_in</code>.
@@ -24,14 +24,14 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 	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_daily.coins_change</code>.
+	 * The parameter <code>Account.check_daily.coinsChange</code>.
 	 */
-	public static final org.jooq.Parameter<java.lang.Integer> coins_change = createParameter("coins_change", org.jooq.impl.SQLDataType.INTEGER, false);
+	public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
 
 	/**
-	 * The parameter <code>Account.check_daily.gems_change</code>.
+	 * The parameter <code>Account.check_daily.gemsChange</code>.
 	 */
-	public static final org.jooq.Parameter<java.lang.Integer> gems_change = createParameter("gems_change", org.jooq.impl.SQLDataType.INTEGER, false);
+	public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
 
 	/**
 	 * The parameter <code>Account.check_daily.pass</code>.
@@ -50,8 +50,8 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 		super("check_daily", mineplex.database.Account.Account);
 
 		addInParameter(accountId_in);
-		addInParameter(coins_change);
-		addInParameter(gems_change);
+		addInParameter(coinsChange);
+		addInParameter(gemsChange);
 		addOutParameter(pass);
 		addOutParameter(outTime);
 	}
@@ -64,17 +64,17 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
 	}
 
 	/**
-	 * Set the <code>coins_change</code> parameter IN value to the routine
+	 * Set the <code>coinsChange</code> parameter IN value to the routine
 	 */
-	public void setCoins_change(java.lang.Integer value) {
-		setValue(mineplex.database.routines.Check_daily.coins_change, value);
+	public void setCoinsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_daily.coinsChange, value);
 	}
 
 	/**
-	 * Set the <code>gems_change</code> parameter IN value to the routine
+	 * Set the <code>gemsChange</code> parameter IN value to the routine
 	 */
-	public void setGems_change(java.lang.Integer value) {
-		setValue(mineplex.database.routines.Check_daily.gems_change, value);
+	public void setGemsChange(java.lang.Integer value) {
+		setValue(mineplex.database.routines.Check_daily.gemsChange, value);
 	}
 
 	/**
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.java
new file mode 100644
index 000000000..8cb172e3b
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.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_rank extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -1491579372;
+
+	/**
+	 * The parameter <code>Account.check_rank.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_rank.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_rank.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_rank.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_rank.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_rank() {
+		super("check_rank", 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_rank.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_rank.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_rank.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/routines/TestPro.java b/Plugins/Mineplex.Database/src/mineplex/database/routines/TestPro.java
new file mode 100644
index 000000000..5c6e7c875
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/routines/TestPro.java
@@ -0,0 +1,41 @@
+/**
+ * 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 TestPro extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -418397480;
+
+	/**
+	 * The parameter <code>Account.testPro.var</code>.
+	 */
+	public static final org.jooq.Parameter<java.sql.Date> var = createParameter("var", org.jooq.impl.SQLDataType.DATE, false);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public TestPro() {
+		super("testPro", mineplex.database.Account.Account);
+
+		addOutParameter(var);
+	}
+
+	/**
+	 * Get the <code>var</code> parameter OUT value from the routine
+	 */
+	public java.sql.Date getVar() {
+		return getValue(var);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
new file mode 100644
index 000000000..fead0616c
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java
@@ -0,0 +1,109 @@
+/**
+ * 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 AccountStat extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 956897097;
+
+	/**
+	 * The reference instance of <code>Account.accountStat</code>
+	 */
+	public static final mineplex.database.tables.AccountStat accountStat = new mineplex.database.tables.AccountStat();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.AccountStatRecord> getRecordType() {
+		return mineplex.database.tables.records.AccountStatRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.accountStat.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountStat.statId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> statId = createField("statId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * 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, "");
+
+	/**
+	 * Create a <code>Account.accountStat</code> table reference
+	 */
+	public AccountStat() {
+		this("accountStat", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.accountStat</code> table reference
+	 */
+	public AccountStat(java.lang.String alias) {
+		this(alias, mineplex.database.tables.AccountStat.accountStat);
+	}
+
+	private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_accountStat_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>>asList(mineplex.database.Keys.KEY_accountStat_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>>asList(mineplex.database.Keys.accountStat_account, mineplex.database.Keys.accountStat_stat);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.AccountStat as(java.lang.String alias) {
+		return new mineplex.database.tables.AccountStat(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.AccountStat rename(java.lang.String name) {
+		return new mineplex.database.tables.AccountStat(name, null);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
index 7113e796b..a2acbbbb5 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 = -1950407601;
+	private static final long serialVersionUID = -70389593;
 
 	/**
 	 * The reference instance of <code>Account.bonus</code>
@@ -44,7 +44,7 @@ public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	/**
 	 * The column <code>Account.bonus.ranktime</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Timestamp> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Date> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.DATE, this, "");
 
 	/**
 	 * Create a <code>Account.bonus</code> table reference
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java
index 2e0a0b810..a72409235 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java
@@ -16,7 +16,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -194264445;
+	private static final long serialVersionUID = -1842631086;
 
 	/**
 	 * The reference instance of <code>Account.clans</code>
@@ -76,6 +76,31 @@ public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> energy = createField("energy", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
 
+	/**
+	 * The column <code>Account.clans.kills</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> kills = createField("kills", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.murder</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> murder = createField("murder", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.deaths</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> deaths = createField("deaths", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.warWins</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warWins = createField("warWins", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * The column <code>Account.clans.warLosses</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warLosses = createField("warLosses", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
 	/**
 	 * Create a <code>Account.clans</code> table reference
 	 */
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java
new file mode 100644
index 000000000..1a64d9373
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java
@@ -0,0 +1,137 @@
+/**
+ * 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 Mailbox extends org.jooq.impl.TableImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 581316209;
+
+	/**
+	 * The reference instance of <code>Account.mailbox</code>
+	 */
+	public static final mineplex.database.tables.Mailbox mailbox = new mineplex.database.tables.Mailbox();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.MailboxRecord> getRecordType() {
+		return mineplex.database.tables.records.MailboxRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.mailbox.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.sender</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> sender = createField("sender", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.message</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> message = createField("message", org.jooq.impl.SQLDataType.VARCHAR.length(1024), this, "");
+
+	/**
+	 * The column <code>Account.mailbox.archived</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> archived = createField("archived", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.deleted</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> deleted = createField("deleted", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.mailbox.timeSent</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.sql.Timestamp> timeSent = createField("timeSent", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
+
+	/**
+	 * Create a <code>Account.mailbox</code> table reference
+	 */
+	public Mailbox() {
+		this("mailbox", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.mailbox</code> table reference
+	 */
+	public Mailbox(java.lang.String alias) {
+		this(alias, mineplex.database.tables.Mailbox.mailbox);
+	}
+
+	private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_mailbox;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_mailbox_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>>asList(mineplex.database.Keys.KEY_mailbox_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>>asList(mineplex.database.Keys.mailbox_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.Mailbox as(java.lang.String alias) {
+		return new mineplex.database.tables.Mailbox(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.Mailbox rename(java.lang.String name) {
+		return new mineplex.database.tables.Mailbox(name, null);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java
new file mode 100644
index 000000000..165075f93
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java
@@ -0,0 +1,117 @@
+/**
+ * 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 RankBenefits extends org.jooq.impl.TableImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1274456623;
+
+	/**
+	 * The reference instance of <code>Account.rankBenefits</code>
+	 */
+	public static final mineplex.database.tables.RankBenefits rankBenefits = new mineplex.database.tables.RankBenefits();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.RankBenefitsRecord> getRecordType() {
+		return mineplex.database.tables.records.RankBenefitsRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.rankBenefits.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.rankBenefits.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.rankBenefits.benefit</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.String> benefit = createField("benefit", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * Create a <code>Account.rankBenefits</code> table reference
+	 */
+	public RankBenefits() {
+		this("rankBenefits", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.rankBenefits</code> table reference
+	 */
+	public RankBenefits(java.lang.String alias) {
+		this(alias, mineplex.database.tables.RankBenefits.rankBenefits);
+	}
+
+	private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_rankBenefits;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_rankBenefits_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>>asList(mineplex.database.Keys.KEY_rankBenefits_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>>asList(mineplex.database.Keys.rankBenefits_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.RankBenefits as(java.lang.String alias) {
+		return new mineplex.database.tables.RankBenefits(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.RankBenefits rename(java.lang.String name) {
+		return new mineplex.database.tables.RankBenefits(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
new file mode 100644
index 000000000..83dc0a684
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java
@@ -0,0 +1,199 @@
+/**
+ * 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 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> {
+
+	private static final long serialVersionUID = 1109290129;
+
+	/**
+	 * Setter for <code>Account.accountStat.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.accountStat.statId</code>.
+	 */
+	public void setStatId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.statId</code>.
+	 */
+	public java.lang.Integer getStatId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.accountStat.value</code>.
+	 */
+	public void setValue(java.lang.Long value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountStat.value</code>.
+	 */
+	public java.lang.Long getValue() {
+		return (java.lang.Long) getValue(2);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record2<java.lang.Integer, java.lang.Integer> key() {
+		return (org.jooq.Record2) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record3 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.AccountStat.accountStat.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.AccountStat.accountStat.statId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Long> field3() {
+		return mineplex.database.tables.AccountStat.accountStat.value;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getStatId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Long value3() {
+		return getValue();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value1(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value2(java.lang.Integer value) {
+		setStatId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord value3(java.lang.Long value) {
+		setValue(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountStatRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Long value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached AccountStatRecord
+	 */
+	public AccountStatRecord() {
+		super(mineplex.database.tables.AccountStat.accountStat);
+	}
+
+	/**
+	 * Create a detached, initialised AccountStatRecord
+	 */
+	public AccountStatRecord(java.lang.Integer accountId, java.lang.Integer statId, java.lang.Long value) {
+		super(mineplex.database.tables.AccountStat.accountStat);
+
+		setValue(0, accountId);
+		setValue(1, statId);
+		setValue(2, value);
+	}
+}
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 c4dc28f8c..be35509b0 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.Timestamp> {
+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> {
 
-	private static final long serialVersionUID = 1527068906;
+	private static final long serialVersionUID = -64019858;
 
 	/**
 	 * Setter for <code>Account.bonus.accountId</code>.
@@ -49,15 +49,15 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Setter for <code>Account.bonus.ranktime</code>.
 	 */
-	public void setRanktime(java.sql.Timestamp value) {
+	public void setRanktime(java.sql.Date value) {
 		setValue(2, value);
 	}
 
 	/**
 	 * Getter for <code>Account.bonus.ranktime</code>.
 	 */
-	public java.sql.Timestamp getRanktime() {
-		return (java.sql.Timestamp) getValue(2);
+	public java.sql.Date getRanktime() {
+		return (java.sql.Date) getValue(2);
 	}
 
 	// -------------------------------------------------------------------------
@@ -80,7 +80,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> fieldsRow() {
+	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> fieldsRow() {
 		return (org.jooq.Row3) super.fieldsRow();
 	}
 
@@ -88,7 +88,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> valuesRow() {
+	public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> valuesRow() {
 		return (org.jooq.Row3) super.valuesRow();
 	}
 
@@ -112,7 +112,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.sql.Timestamp> field3() {
+	public org.jooq.Field<java.sql.Date> field3() {
 		return mineplex.database.tables.Bonus.bonus.ranktime;
 	}
 
@@ -136,7 +136,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value3() {
+	public java.sql.Date value3() {
 		return getRanktime();
 	}
 
@@ -162,7 +162,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public BonusRecord value3(java.sql.Timestamp value) {
+	public BonusRecord value3(java.sql.Date value) {
 		setRanktime(value);
 		return this;
 	}
@@ -171,7 +171,7 @@ 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.Timestamp value3) {
+	public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Date value3) {
 		return this;
 	}
 
@@ -189,7 +189,7 @@ 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.Timestamp ranktime) {
+	public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Date ranktime) {
 		super(mineplex.database.tables.Bonus.bonus);
 
 		setValue(0, accountId);
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java
index d1ca82539..59efbb657 100644
--- a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.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 ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> {
+public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
 
-	private static final long serialVersionUID = -1803774546;
+	private static final long serialVersionUID = -1588610871;
 
 	/**
 	 * Setter for <code>Account.clans.id</code>.
@@ -144,6 +144,76 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return (java.lang.Integer) getValue(8);
 	}
 
+	/**
+	 * Setter for <code>Account.clans.kills</code>.
+	 */
+	public void setKills(java.lang.Integer value) {
+		setValue(9, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.kills</code>.
+	 */
+	public java.lang.Integer getKills() {
+		return (java.lang.Integer) getValue(9);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.murder</code>.
+	 */
+	public void setMurder(java.lang.Integer value) {
+		setValue(10, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.murder</code>.
+	 */
+	public java.lang.Integer getMurder() {
+		return (java.lang.Integer) getValue(10);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.deaths</code>.
+	 */
+	public void setDeaths(java.lang.Integer value) {
+		setValue(11, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.deaths</code>.
+	 */
+	public java.lang.Integer getDeaths() {
+		return (java.lang.Integer) getValue(11);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.warWins</code>.
+	 */
+	public void setWarWins(java.lang.Integer value) {
+		setValue(12, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.warWins</code>.
+	 */
+	public java.lang.Integer getWarWins() {
+		return (java.lang.Integer) getValue(12);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.warLosses</code>.
+	 */
+	public void setWarLosses(java.lang.Integer value) {
+		setValue(13, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.warLosses</code>.
+	 */
+	public java.lang.Integer getWarLosses() {
+		return (java.lang.Integer) getValue(13);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -157,23 +227,23 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	}
 
 	// -------------------------------------------------------------------------
-	// Record9 type implementation
+	// Record14 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row9) super.fieldsRow();
+	public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row14) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row9) super.valuesRow();
+	public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row14) super.valuesRow();
 	}
 
 	/**
@@ -248,6 +318,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return mineplex.database.tables.Clans.clans.energy;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field10() {
+		return mineplex.database.tables.Clans.clans.kills;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field11() {
+		return mineplex.database.tables.Clans.clans.murder;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field12() {
+		return mineplex.database.tables.Clans.clans.deaths;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field13() {
+		return mineplex.database.tables.Clans.clans.warWins;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field14() {
+		return mineplex.database.tables.Clans.clans.warLosses;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -320,6 +430,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		return getEnergy();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value10() {
+		return getKills();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value11() {
+		return getMurder();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value12() {
+		return getDeaths();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value13() {
+		return getWarWins();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value14() {
+		return getWarLosses();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -405,7 +555,52 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	 * {@inheritDoc}
 	 */
 	@Override
-	public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9) {
+	public ClansRecord value10(java.lang.Integer value) {
+		setKills(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value11(java.lang.Integer value) {
+		setMurder(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value12(java.lang.Integer value) {
+		setDeaths(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value13(java.lang.Integer value) {
+		setWarWins(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value14(java.lang.Integer value) {
+		setWarLosses(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9, java.lang.Integer value10, java.lang.Integer value11, java.lang.Integer value12, java.lang.Integer value13, java.lang.Integer value14) {
 		return this;
 	}
 
@@ -423,7 +618,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 	/**
 	 * Create a detached, initialised ClansRecord
 	 */
-	public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy) {
+	public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy, java.lang.Integer kills, java.lang.Integer murder, java.lang.Integer deaths, java.lang.Integer warWins, java.lang.Integer warLosses) {
 		super(mineplex.database.tables.Clans.clans);
 
 		setValue(0, id);
@@ -435,5 +630,10 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
 		setValue(6, dateCreated);
 		setValue(7, lastOnline);
 		setValue(8, energy);
+		setValue(9, kills);
+		setValue(10, murder);
+		setValue(11, deaths);
+		setValue(12, warWins);
+		setValue(13, warLosses);
 	}
 }
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.java
new file mode 100644
index 000000000..05b2f573d
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.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 MailboxRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> {
+
+	private static final long serialVersionUID = 763437590;
+
+	/**
+	 * Setter for <code>Account.mailbox.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.sender</code>.
+	 */
+	public void setSender(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.sender</code>.
+	 */
+	public java.lang.String getSender() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.message</code>.
+	 */
+	public void setMessage(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.message</code>.
+	 */
+	public java.lang.String getMessage() {
+		return (java.lang.String) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.archived</code>.
+	 */
+	public void setArchived(java.lang.Byte value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.archived</code>.
+	 */
+	public java.lang.Byte getArchived() {
+		return (java.lang.Byte) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.deleted</code>.
+	 */
+	public void setDeleted(java.lang.Byte value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.deleted</code>.
+	 */
+	public java.lang.Byte getDeleted() {
+		return (java.lang.Byte) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.mailbox.timeSent</code>.
+	 */
+	public void setTimeSent(java.sql.Timestamp value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.mailbox.timeSent</code>.
+	 */
+	public java.sql.Timestamp getTimeSent() {
+		return (java.sql.Timestamp) 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.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> fieldsRow() {
+		return (org.jooq.Row7) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> valuesRow() {
+		return (org.jooq.Row7) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.Mailbox.mailbox.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.Mailbox.mailbox.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.Mailbox.mailbox.sender;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.Mailbox.mailbox.message;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field5() {
+		return mineplex.database.tables.Mailbox.mailbox.archived;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field6() {
+		return mineplex.database.tables.Mailbox.mailbox.deleted;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.sql.Timestamp> field7() {
+		return mineplex.database.tables.Mailbox.mailbox.timeSent;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getSender();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getMessage();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value5() {
+		return getArchived();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value6() {
+		return getDeleted();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.sql.Timestamp value7() {
+		return getTimeSent();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value2(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value3(java.lang.String value) {
+		setSender(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value4(java.lang.String value) {
+		setMessage(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value5(java.lang.Byte value) {
+		setArchived(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value6(java.lang.Byte value) {
+		setDeleted(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord value7(java.sql.Timestamp value) {
+		setTimeSent(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public MailboxRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.Byte value5, java.lang.Byte value6, java.sql.Timestamp value7) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached MailboxRecord
+	 */
+	public MailboxRecord() {
+		super(mineplex.database.tables.Mailbox.mailbox);
+	}
+
+	/**
+	 * Create a detached, initialised MailboxRecord
+	 */
+	public MailboxRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String sender, java.lang.String message, java.lang.Byte archived, java.lang.Byte deleted, java.sql.Timestamp timeSent) {
+		super(mineplex.database.tables.Mailbox.mailbox);
+
+		setValue(0, id);
+		setValue(1, accountId);
+		setValue(2, sender);
+		setValue(3, message);
+		setValue(4, archived);
+		setValue(5, deleted);
+		setValue(6, timeSent);
+	}
+}
diff --git a/Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java
new file mode 100644
index 000000000..9eec884c0
--- /dev/null
+++ b/Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java
@@ -0,0 +1,199 @@
+/**
+ * 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 RankBenefitsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.String> {
+
+	private static final long serialVersionUID = 1205523956;
+
+	/**
+	 * Setter for <code>Account.rankBenefits.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.rankBenefits.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.rankBenefits.benefit</code>.
+	 */
+	public void setBenefit(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.rankBenefits.benefit</code>.
+	 */
+	public java.lang.String getBenefit() {
+		return (java.lang.String) getValue(2);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record3 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.RankBenefits.rankBenefits.benefit;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getBenefit();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value2(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord value3(java.lang.String value) {
+		setBenefit(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public RankBenefitsRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached RankBenefitsRecord
+	 */
+	public RankBenefitsRecord() {
+		super(mineplex.database.tables.RankBenefits.rankBenefits);
+	}
+
+	/**
+	 * Create a detached, initialised RankBenefitsRecord
+	 */
+	public RankBenefitsRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String benefit) {
+		super(mineplex.database.tables.RankBenefits.rankBenefits);
+
+		setValue(0, id);
+		setValue(1, accountId);
+		setValue(2, benefit);
+	}
+}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java
index a8216b3fe..5c09e8423 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java
@@ -33,33 +33,6 @@ public class HubRepository
 	public void initialize(boolean us) 
 	{
 		_us = us;
-		
-		PreparedStatement preparedStatement = null;
-
-		try (Connection connection = DBPool.MINEPLEX.getConnection())
-		{
-			// Create table
-			preparedStatement = connection.prepareStatement(CREATE_NEWS_TABLE);
-			preparedStatement.execute();
-		}
-		catch (Exception exception)
-		{
-			exception.printStackTrace();
-		}
-		finally
-		{
-			if (preparedStatement != null)
-			{
-				try
-				{
-					preparedStatement.close();
-				} 
-				catch (SQLException e)
-				{
-					e.printStackTrace();
-				}
-			}
-		}
 	}
 	
 	public HashMap<String, String> retrieveNewsEntries()
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
index 727b3c312..ba341104a 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
@@ -58,7 +58,7 @@ public class NewsManager extends MiniPlugin
 				"News Line 3",
 				"News Line 4",
 				};
-		
+
 		RefreshNews();
 	}
 	
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
index e9a7af389..8820efd46 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
@@ -11,10 +11,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.java.JavaPlugin;
+
 import net.minecraft.server.v1_7_R4.ChatSerializer;
 import net.minecraft.server.v1_7_R4.PacketPlayOutChat;
 import net.minecraft.util.com.google.gson.JsonObject;
-
 import mineplex.core.MiniDbClientPlugin;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.common.Rank;
@@ -212,7 +212,7 @@ public class PollManager extends MiniDbClientPlugin<PlayerPollData>
 	}
 
 	@Override
-	public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
+	public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
 	{
 		Set(playerName, _repository.loadPollData(resultSet));
 	}
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
index 87d3749a7..36c62ffe5 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
@@ -33,7 +33,7 @@ public class GemHunterCommand extends CommandBase<SalesPackageManager>
 		else if (amount == 8)
 			tempExp = 220000;
 		
-		final int experience = tempExp;
+		final long experience = tempExp;
 		
 		Plugin.getClientManager().loadClientByName(playerName, new Runnable()
 		{

From ae5c74680cbfd19e658e259c5ee96fc3179a9720 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 04:30:56 -0400
Subject: [PATCH 43/70] SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE

---
 .../game/arcade/game/games/lobbers/BombLobbers.java        | 7 ++++++-
 1 file changed, 6 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 ce716f561..0d29c13ee 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
@@ -60,6 +60,11 @@ import org.bukkit.util.Vector;
 
 public class BombLobbers extends TeamGame implements IThrown
 {
+	/**
+	 * @author Mysticate
+	 * Created in July, 2015
+	 */
+	
 	private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
 	
 	private NautHashMap<TNTPrimed, BombToken> _tnt = new NautHashMap<TNTPrimed, BombToken>();
@@ -324,7 +329,7 @@ public class BombLobbers extends TeamGame implements IThrown
 					
 					tnt.getKey().remove();
 					
-					_tnt.remove(tnt.getKey());
+					iterator.remove();
 					_tnt.put(newTNT, token);
 				}
 			}

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 44/70] 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 9feac87a15f4d2200edc90f4016f4ad93348190d Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Sat, 25 Jul 2015 09:51:23 -0400
Subject: [PATCH 45/70] Fixed not being able to buy Armorer. Lowered view
 distance on particles.

---
 .../nautilus/game/arcade/game/games/lobbers/BombLobbers.java  | 4 ++--
 .../game/arcade/game/games/lobbers/kits/KitArmorer.java       | 3 +--
 .../game/arcade/game/games/lobbers/kits/perks/PerkWaller.java | 4 ----
 3 files changed, 3 insertions(+), 8 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 0d29c13ee..51190eed7 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
@@ -445,13 +445,13 @@ public class BombLobbers extends TeamGame implements IThrown
 				{
 					for (int i = 0 ; i < 5 ; 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 < 5 ; 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 47ecd4222..3a94cb31a 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
@@ -13,7 +13,6 @@ 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
 {
@@ -30,7 +29,7 @@ public class KitArmorer extends Kit
 						{
 				new PerkCraftman()
 						}, EntityType.ZOMBIE,
-				new ItemStack(Material.AIR));
+				new ItemBuilder(Material.GOLD_INGOT).build());
 	}
 	
 	@Override
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
index afb0e8b47..9f7802238 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java
@@ -4,19 +4,15 @@ import java.util.HashSet;
 import java.util.Set;
 
 import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilEvent.ActionType;
 import mineplex.core.common.util.UtilInv;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
 import nautilus.game.arcade.kit.Perk;
 
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;

From 7c7b166b4d626b0a5da823859fbb48fe8b996faa Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sat, 25 Jul 2015 16:05:12 +0200
Subject: [PATCH 46/70] reduced particles a little

---
 .../nautilus/game/arcade/game/games/lobbers/BombLobbers.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 51190eed7..4fbb726a5 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
@@ -443,13 +443,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());
 				}

From dffde689824bf8f3fb5eb8c9e03529fe9d1c9c81 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sat, 25 Jul 2015 17:11:02 +0200
Subject: [PATCH 47/70] fixed bug removed debug

---
 .../src/mineplex/core/common/util/UtilText.java            | 7 ++++++-
 .../game/arcade/game/games/minestrike/items/guns/Gun.java  | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
index 694739fa9..4ae8f94dc 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
@@ -48,6 +48,11 @@ public class UtilText {
 
 	public static boolean isStringSimilar(String newString, String oldString, float matchRequirement)
 	{
+		if (newString.length() <= 3)
+		{
+			return newString.toLowerCase().equals(oldString.toLowerCase());
+		}
+		
 		for (int i=0 ; i < newString.length() * matchRequirement ; i++)
 		{
 			int matchFromIndex = 0;
@@ -56,7 +61,7 @@ public class UtilText {
 			for (int j=0 ; j < oldString.length() ; j++)
 			{
 				//End of newString
-				if (i+j > newString.length())
+				if (i+j >= newString.length())
 				{
 					break;
 				}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
index 0a70ee22a..dfd1863e8 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
@@ -202,7 +202,7 @@ public class Gun extends StrikeItem
 		else if (player.isSneaking() && _gunStats.getGunType() != GunType.SNIPER) 
 			cone = cone * 0.8;
 
-		System.out.println("Vision: " + player.hasPotionEffect(PotionEffectType.NIGHT_VISION));
+		//System.out.println("Vision: " + player.hasPotionEffect(PotionEffectType.NIGHT_VISION));
 		
 		//Sniper Zoomed
 		if (!player.hasPotionEffect(PotionEffectType.NIGHT_VISION) && _gunStats.getScope() && UtilGear.isMat(player.getInventory().getHelmet(), Material.PUMPKIN))
@@ -223,7 +223,7 @@ public class Gun extends StrikeItem
 			}
 		}
 		
-		System.out.println("Cone: " + cone);
+		//System.out.println("Cone: " + cone);
 
 		return cone;
 	}

From 2b240f3dfab704d1257c9593f29e9dcd172a5551 Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sat, 25 Jul 2015 17:16:20 +0200
Subject: [PATCH 48/70] removed visdata debug

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

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java b/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
index 4336048d5..bcbb9453e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/visibility/VisibilityManager.java
@@ -91,7 +91,7 @@ public class VisibilityManager extends MiniPlugin
 		_data.remove(event.getPlayer());
 	}
 
-	@EventHandler
+	//@EventHandler  DISABLED
 	public void updateDebug(UpdateEvent event)
 	{
 		if (event.getType() != UpdateType.MIN_01)

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 49/70] 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 50/70] 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 51/70] 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 52/70] 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 1247f33b1e45846e797ae1647631ceb2a70ee11d Mon Sep 17 00:00:00 2001
From: Mini-Chiss <Jozsa@hotmail.com>
Date: Sun, 26 Jul 2015 11:43:24 +0200
Subject: [PATCH 53/70] end game stats will display, even if no gems awarded.

---
 .../game/arcade/managers/GameGemManager.java  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

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 121d7d44b..3617ab6a1 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
@@ -174,7 +174,7 @@ public class GameGemManager implements Listener
 			}
 		}
 
-		if (DoubleGem && game.GemDoubleEnabled)
+		if (DoubleGem && game.GemDoubleEnabled && UtilPlayer.is1_8(player))
 			total += earned;
 
 		Manager.GetDonation().RewardGems(null, "Earned " + game.GetName(), player.getName(), player.getUniqueId(), total);
@@ -186,9 +186,6 @@ public class GameGemManager implements Listener
 
 	public void AnnounceGems(Game game, Player player, HashMap<String,GemData> gems, boolean give) 
 	{
-		if (!Manager.IsRewardGems())
-			return;
-
 		if (gems == null)	
 			return;
 
@@ -197,7 +194,7 @@ public class GameGemManager implements Listener
 		UtilPlayer.message(player, "");
 		UtilPlayer.message(player, ArcadeFormat.Line);
 
-		UtilPlayer.message(player, "§f§lGems Earned");
+		UtilPlayer.message(player, Manager.IsRewardGems() ? "§f§lGems Earned" : "§f§lGame Stats");
 		UtilPlayer.message(player, "");
 
 		int earnedGems = 0;
@@ -214,9 +211,17 @@ public class GameGemManager implements Listener
 			String amountStr = "";
 			if (amount > 0)
 				amountStr = amount + " ";
+			
+			String out = "";
+			if (Manager.IsRewardGems())
+				out += F.elem(C.cGreen + "+" + (int)(gemCount * game.GemMultiplier) + " Gems") + " for ";
+			out += F.elem(amountStr + type);
 
-			UtilPlayer.message(player, F.elem(C.cGreen + "+" + (int)(gemCount * game.GemMultiplier) + " Gems") + " for " + F.elem(amountStr + type));
+			UtilPlayer.message(player, out);
 		}
+		
+		if (!Manager.IsRewardGems())
+			return;
 
 		earnedGems = (int) (earnedGems * game.GemMultiplier);
 
@@ -245,9 +250,9 @@ public class GameGemManager implements Listener
 		}
 
 		//Double Gem
-		if (DoubleGem && game.GemDoubleEnabled)
+		if (DoubleGem && game.GemDoubleEnabled && UtilPlayer.is1_8(player))
 		{
-			UtilPlayer.message(player, F.elem(C.cGreen + "+" + (earnedGems) + " Gems") + " for " + F.elem(C.cDGreen + "Double Gem Bonus"));
+			UtilPlayer.message(player, F.elem(C.cGreen + "+" + (earnedGems) + " Gems") + " for " + F.elem(C.cDGreen + "Double Gem Weekend"));
 
 			totalGems += earnedGems;
 		}

From 26ed7ebb94b79d18c542d902bb5ae8f592dc3fc9 Mon Sep 17 00:00:00 2001
From: Jonathan Williams <jonathan@mineplex.com>
Date: Sun, 26 Jul 2015 08:49:35 -0700
Subject: [PATCH 54/70] Fixes to redis Fixes for stat handler.

---
 .../core/stats/SecondaryStatHandler.java      | 100 ++++++++++++++++--
 .../src/mineplex/serverdata/Utility.java      |   1 +
 .../src/mineplex/staffServer/StaffServer.java |   3 +-
 3 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
index 1aa39a19c..5901a17e1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java
@@ -49,7 +49,6 @@ public class SecondaryStatHandler implements ILoginProcessor
 				DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
 
 				final List<Insert> inserts = new ArrayList<>();
-				final List<Delete> deletes = new ArrayList<>();
 
 				for (String statName : oldPlayerStats.getStatsNames())
 				{
@@ -59,14 +58,9 @@ public class SecondaryStatHandler implements ILoginProcessor
 							.insertInto(Tables.accountStat)
 							.set(Tables.accountStat.accountId, accountId)
 							.set(Tables.accountStat.statId, statId)
-							.set(Tables.accountStat.value, oldPlayerStats.getStat(statName));
+							.set(Tables.accountStat.value, Math.max(oldPlayerStats.getStat(statName), 0L));
 
 					inserts.add(insert);
-					
-					Delete delete = context.delete(Tables.accountStats)
-								.where(Tables.accountStats.accountId.equal(accountId));
-					
-					deletes.add(delete);
 				}
 				
 				context.transaction(new TransactionalRunnable()
@@ -75,7 +69,6 @@ public class SecondaryStatHandler implements ILoginProcessor
 					public void run(Configuration config) throws Exception
 					{
 						DSL.using(config).batch(inserts).execute();
-						DSL.using(config).batch(deletes).execute();
 					}
 				});
 			}
@@ -87,6 +80,97 @@ public class SecondaryStatHandler implements ILoginProcessor
 		else
 		{
 			_statsManager.replacePlayerHack(playerName, newPlayerStats);
+			
+			if (oldPlayerStats.getStatsNames().size() != 0)
+			{
+				try
+				{
+					final DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
+					final List<Update> updates = new ArrayList<>();
+					final List<Insert> inserts = new ArrayList<>();
+					boolean foundNegativeStat = false;
+					boolean foundLessThanStat = false;
+					
+					for (String statName : oldPlayerStats.getStatsNames())
+					{
+						Integer statId = _statsManager.getStatId(statName);
+						
+						Insert insert = context
+								.insertInto(Tables.accountStat)
+								.set(Tables.accountStat.accountId, accountId)
+								.set(Tables.accountStat.statId, statId)
+								.set(Tables.accountStat.value, 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))
+								.where(Tables.accountStat.accountId.eq(accountId))
+								.and(Tables.accountStat.statId.eq(statId));
+	
+						updates.add(update);
+						
+						if (oldPlayerStats.getStat(statName) < 0)
+						{
+							foundNegativeStat = true;
+						}
+						else if (newPlayerStats.getStat(statName) < oldPlayerStats.getStat(statName))
+						{
+							foundLessThanStat = true;
+						}
+					}
+					
+					if (foundNegativeStat && foundLessThanStat)
+					{
+						context.transaction(new TransactionalRunnable()
+						{
+							@Override
+							public void run(Configuration config) throws Exception
+							{
+								int[] updateResult = context.batch(updates).execute();
+
+								for (int i = 0; i < updateResult.length; i++)
+								{
+									if (updateResult[i] > 0)
+										inserts.set(i, null);
+								}
+
+								inserts.removeAll(Collections.singleton(null));
+
+								context.batch(inserts).execute();
+
+								System.out.println("Updating");
+							}
+						});
+					}
+					
+/*
+					final List<Delete> deletes = new ArrayList<>();
+
+					for (String statName : oldPlayerStats.getStatsNames())
+					{
+						Delete delete = context.delete(Tables.accountStats)
+									.where(Tables.accountStats.accountId.equal(accountId));
+						
+						deletes.add(delete);
+					}
+					
+					context.transaction(new TransactionalRunnable()
+					{
+						@Override
+						public void run(Configuration config) throws Exception
+						{
+							DSL.using(config).batch(deletes).execute();
+						}
+					});
+					*/
+				}
+				catch (Exception e)
+				{
+					e.printStackTrace();
+				}
+			}
 		}
 	}
 
diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
index 9e6dba353..790a2efa3 100644
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
@@ -134,6 +134,7 @@ public class Utility
 		JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
 	    jedisPoolConfig.setMaxWaitMillis(1000);
 	    jedisPoolConfig.setMinIdle(5);
+	    jedisPoolConfig.setTestOnBorrow(true);
 		return new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
 	}
 	
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java
index 37b54b75b..f349df29e 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java
@@ -83,11 +83,12 @@ public class StaffServer extends JavaPlugin
 		((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp"));
 		((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("492ff708-fe76-4c5a-b9ed-a747b5fa20a0"), "Cherdy8s"));
 		((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("80f40f29-4d66-4355-a32f-01a65af2a14c"), "rl6"));
-		
+		((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("cf85f470-5248-4978-8208-435736fa136e"), "RustyRoo"));
 		
 		
 		((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("377bdea3-badc-448d-81c1-65db43b17ea4"), "Strutt20"));
 		((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp"));
 		((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("2d5fd31b-0aa5-41db-a62d-a4611a24349a"), "ishh"));
+		((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("cf85f470-5248-4978-8208-435736fa136e"), "RustyRoo"));		
 	}
 }

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 55/70] 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 56/70] 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 57/70] 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 58/70] 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 59/70] 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 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 60/70] 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 61/70] 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 62/70] 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 63/70] 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 64/70] 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 65/70] 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 66/70] 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 67/70] 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 68/70] 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 69/70] 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 70/70] 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++;
 			}