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

Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java

@@ -3,17 +3,20 @@ package mineplex.bungee.motd;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.connection.CustomMotd;
 import net.md_5.bungee.connection.CustomMotdFactory;
 import net.md_5.bungee.connection.InitialHandler;
+import net.md_5.bungee.event.EventHandler;
 
 public class MotdManager implements Listener, Runnable, CustomMotdFactory
 {
 	private Plugin _plugin;
 	private MotdRepository _repository;
 
+	private String firstLine = "              §b§l§m   §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m   §r";
 	private List<String> _motdLines;
 	
 	public MotdManager(Plugin plugin)
@@ -25,14 +28,33 @@ public class MotdManager implements Listener, Runnable, CustomMotdFactory
 		
 		_repository = new MotdRepository();
 		_repository.initialize();
+	}
 
-		InitialHandler.setCustomMotdFactory(this); // For animated motd
+	@EventHandler
+	public void serverPing(ProxyPingEvent event)
+	{
+		net.md_5.bungee.api.ServerPing serverPing = event.getResponse();
+
+		String motd = firstLine;
+		if (_motdLines != null && _motdLines.size() > 0)
+			motd += "\n" + _motdLines.get(0);
+
+		event.setResponse(new net.md_5.bungee.api.ServerPing(serverPing.getVersion(), serverPing.getPlayers(), motd, serverPing.getFaviconObject()));
 	}
 	
 	@Override
 	public void run()
 	{
 		_motdLines = _repository.retrieveMotd();
+
+		if (_repository.retrieveMotdAnimated())
+		{
+			InitialHandler.setCustomMotdFactory(this);
+		}
+		else
+		{
+			InitialHandler.setCustomMotdFactory(null);
+		}
 	}
 
 	public List<String> getMotdLines()

Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java

@@ -19,6 +19,7 @@ public class MotdRepository
 	
 	private static String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS BungeeMotd (id INT NOT NULL AUTO_INCREMENT, motd VARCHAR(256), PRIMARY KEY (id));";
 	private static String RETRIEVE_MOTD = "SELECT motd FROM BungeeMotd;";
+	private static String RETRIEVE_ANIMATED = "SELECT value FROM bungeeSettings WHERE id='animatedMotd'";
 
 	public void initialize()
 	{
@@ -113,4 +114,58 @@ public class MotdRepository
 		
 		return lines;
 	}
+
+	public boolean retrieveMotdAnimated()
+	{
+		boolean enabled = false;
+
+		ResultSet resultSet = null;
+		PreparedStatement preparedStatement = null;
+
+		try
+		{
+			if (_connection == null || _connection.isClosed())
+				_connection = DriverManager.getConnection(_connectionString, _userName, _password);
+
+			preparedStatement = _connection.prepareStatement(RETRIEVE_ANIMATED);
+			resultSet = preparedStatement.executeQuery();
+
+			while (resultSet.next())
+			{
+				enabled = resultSet.getBoolean(1);
+			}
+		}
+		catch (Exception exception)
+		{
+			exception.printStackTrace();
+		}
+		finally
+		{
+			if (preparedStatement != null)
+			{
+				try
+				{
+					preparedStatement.close();
+				}
+				catch (SQLException e)
+				{
+					e.printStackTrace();
+				}
+			}
+
+			if (resultSet != null)
+			{
+				try
+				{
+					resultSet.close();
+				}
+				catch (SQLException e)
+				{
+					e.printStackTrace();
+				}
+			}
+		}
+
+		return enabled;
+	}
 }

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInv.java

@@ -41,6 +41,11 @@ public class UtilInv
 		itemStack.addEnchantment(_enchantment, 1);
 	}
 	
+	public static void removeDullEnchantment(ItemStack itemStack)
+	{
+	    itemStack.removeEnchantment(_enchantment);
+	}
+	
 	@SuppressWarnings("deprecation")
 	public static boolean insert(Player player, ItemStack stack)
 	{

Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java

@@ -1,5 +1,6 @@
 package mineplex.core;
 
+import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -52,6 +53,16 @@ public abstract class MiniPlugin implements Listener
 		_plugin.getServer().getPluginManager().registerEvents(listener, _plugin);
 	}
 	
+	public void RegisterSelf()
+	{
+		RegisterEvents(this);
+	}
+	
+	public void DeregisterSelf()
+	{
+		HandlerList.unregisterAll(this);
+	}
+	
 	public final void onEnable()
 	{
 		long epoch = System.currentTimeMillis();

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java

@@ -4,11 +4,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
@@ -18,6 +17,7 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.gadget.types.ParticleGadget;
+import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.gadget.GadgetManager;
@@ -33,8 +33,10 @@ public class ParticleBlizzard extends ParticleGadget
 				C.cWhite + "You are a mighty frost lord.",
 				C.cWhite + "Your double jumps and arrows",
 				C.cWhite + "are enchanted with snow powers.",
+				" ",
+				C.cPurple + "Purchased at www.mineplex.com/shop",
 				},
-				1,
+				-1,
 				Material.SNOW_BALL, (byte)0);
 	}
 
@@ -55,7 +57,25 @@ public class ParticleBlizzard extends ParticleGadget
 			}
 			else
 			{
-				UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, player.getLocation().add(0, 5, 0), 1f, 0f, 1f, 0, 30);
+				player.getWorld().playSound(player.getLocation(), Sound.AMBIENCE_RAIN, 0.015f, 0.2f);
+				
+				double scale = (double)(player.getTicksLived() % 50) / 50d;
+				
+				for (int i = 0 ; i < 8 ; i++)
+				{
+					double r = (1d-scale) * Math.PI * 2;
+					
+					double x = Math.sin(r + (i * (Math.PI/4))) * (r%(Math.PI * 4)) * 0.4;
+					double z = Math.cos(r + (i * (Math.PI/4))) * (r%(Math.PI * 4)) * 0.4;
+					
+					UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, player.getLocation().add(x, scale * 3, z), 0f, 0f, 0f, 0, 1);
+					
+					if (scale > 0.95 && Recharge.Instance.use(player, GetName(), 1000, false, false))
+					{
+						UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, player.getLocation().add(0, scale * 3.5, 0), 0f, 0f, 0f, 0.2f, 60);
+						player.getWorld().playSound(player.getLocation(), Sound.STEP_SNOW, 1f, 1.5f);
+					}
+				}
 			}
 		}
 	}
@@ -83,7 +103,6 @@ public class ParticleBlizzard extends ParticleGadget
 			{
 				if (GetActive().contains(event.getEntity().getShooter()))
 				{
-					//UtilFirework.launchFirework(player.getEyeLocation(), Type.BALL, color(), true, true, new Vector(r(0.1),r(0.1),r(0.1)), 1);
 					_arrows.add((Arrow)event.getEntity());
 				}
 			}

Plugins/Mineplex.Database/src/mineplex/database/Account.java

@@ -11,7 +11,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 = 477510632;
+	private static final long serialVersionUID = 1260689680;
 
 	/**
 	 * The singleton instance of <code>Account</code>
@@ -34,6 +34,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 
 	private final java.util.List<org.jooq.Table<?>> getTables0() {
 		return java.util.Arrays.<org.jooq.Table<?>>asList(
+			mineplex.database.tables.AccountClan.accountClan,
 			mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions,
 			mineplex.database.tables.AccountFriend.accountFriend,
 			mineplex.database.tables.AccountGemTransactions.accountGemTransactions,
@@ -42,6 +43,13 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.AccountPreferences.accountPreferences,
 			mineplex.database.tables.Accounts.accounts,
 			mineplex.database.tables.AccountStats.accountStats,
+			mineplex.database.tables.ClanAlliances.clanAlliances,
+			mineplex.database.tables.Clans.clans,
+			mineplex.database.tables.ClanTerritory.clanTerritory,
+			mineplex.database.tables.EloRating.eloRating,
+			mineplex.database.tables.FieldBlock.fieldBlock,
+			mineplex.database.tables.FieldMonster.fieldMonster,
+			mineplex.database.tables.FieldOre.fieldOre,
 			mineplex.database.tables.GamePlayers.gamePlayers,
 			mineplex.database.tables.Games.games,
 			mineplex.database.tables.ItemCategories.itemCategories,
@@ -51,8 +59,8 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
 			mineplex.database.tables.PlayerMap.playerMap,
 			mineplex.database.tables.Polls.polls,
 			mineplex.database.tables.RankBenefits.rankBenefits,
-			mineplex.database.tables.RewardLog.rewardLog,
 			mineplex.database.tables.ServerPassword.serverPassword,
+			mineplex.database.tables.Spawns.spawns,
 			mineplex.database.tables.Stats.stats,
 			mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard);
 	}

Plugins/Mineplex.Database/src/mineplex/database/Keys.java

@@ -18,6 +18,7 @@ public class Keys {
 	// IDENTITY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.Identity<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> IDENTITY_accountClan = Identities0.IDENTITY_accountClan;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> IDENTITY_accountCoinTransactions = Identities0.IDENTITY_accountCoinTransactions;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> IDENTITY_accountFriend = Identities0.IDENTITY_accountFriend;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> IDENTITY_accountGemTransactions = Identities0.IDENTITY_accountGemTransactions;
@@ -26,6 +27,13 @@ public class Keys {
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = Identities0.IDENTITY_accounts;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = Identities0.IDENTITY_accountStats;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = Identities0.IDENTITY_clanAlliances;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = Identities0.IDENTITY_clans;
+	public static final org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = Identities0.IDENTITY_clanTerritory;
+	public static final org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> IDENTITY_eloRating = Identities0.IDENTITY_eloRating;
+	public static final org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = Identities0.IDENTITY_fieldBlock;
+	public static final org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = Identities0.IDENTITY_fieldMonster;
+	public static final org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = Identities0.IDENTITY_fieldOre;
 	public static final org.jooq.Identity<mineplex.database.tables.records.GamePlayersRecord, java.lang.Integer> IDENTITY_gamePlayers = Identities0.IDENTITY_gamePlayers;
 	public static final org.jooq.Identity<mineplex.database.tables.records.GamesRecord, java.lang.Integer> IDENTITY_games = Identities0.IDENTITY_games;
 	public static final org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories;
@@ -35,8 +43,8 @@ public class Keys {
 	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.RewardLogRecord, java.lang.Integer> IDENTITY_rewardLog = Identities0.IDENTITY_rewardLog;
 	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.StatsRecord, java.lang.Integer> IDENTITY_stats = Identities0.IDENTITY_stats;
 	public static final org.jooq.Identity<mineplex.database.tables.records.TournamentLeaderboardRecord, java.lang.Integer> IDENTITY_tournamentLeaderboard = Identities0.IDENTITY_tournamentLeaderboard;
 
@@ -44,6 +52,7 @@ public class Keys {
 	// UNIQUE and PRIMARY KEY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord> KEY_accountClan_PRIMARY = UniqueKeys0.KEY_accountClan_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord> KEY_accountCoinTransactions_PRIMARY = UniqueKeys0.KEY_accountCoinTransactions_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_PRIMARY = UniqueKeys0.KEY_accountFriend_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_uuidIndex = UniqueKeys0.KEY_accountFriend_uuidIndex;
@@ -58,6 +67,14 @@ public class Keys {
 	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.AccountStatsRecord> KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_accountStatIndex = UniqueKeys0.KEY_accountStats_accountStatIndex;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = UniqueKeys0.KEY_clanAlliances_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = UniqueKeys0.KEY_clans_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = UniqueKeys0.KEY_clanTerritory_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = UniqueKeys0.KEY_eloRating_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = UniqueKeys0.KEY_eloRating_uuid_gameType_index;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = UniqueKeys0.KEY_fieldBlock_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> KEY_fieldMonster_PRIMARY = UniqueKeys0.KEY_fieldMonster_PRIMARY;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> KEY_fieldOre_PRIMARY = UniqueKeys0.KEY_fieldOre_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GamePlayersRecord> KEY_gamePlayers_PRIMARY = UniqueKeys0.KEY_gamePlayers_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.GamesRecord> KEY_games_PRIMARY = UniqueKeys0.KEY_games_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_PRIMARY = UniqueKeys0.KEY_itemCategories_PRIMARY;
@@ -70,8 +87,8 @@ public class Keys {
 	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.RewardLogRecord> KEY_rewardLog_PRIMARY = UniqueKeys0.KEY_rewardLog_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.StatsRecord> KEY_stats_PRIMARY = UniqueKeys0.KEY_stats_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = UniqueKeys0.KEY_stats_nameIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLeaderboardRecord> KEY_tournamentLeaderboard_PRIMARY = UniqueKeys0.KEY_tournamentLeaderboard_PRIMARY;
@@ -81,6 +98,8 @@ public class Keys {
 	// FOREIGN KEY definitions
 	// -------------------------------------------------------------------------
 
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> accountClan_ibfk_1 = ForeignKeys0.accountClan_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> accountClan_ibfk_2 = ForeignKeys0.accountClan_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountCoinTransactions_ibfk_1 = ForeignKeys0.accountCoinTransactions_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = ForeignKeys0.accountGemTransactions_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = ForeignKeys0.accountInventory_ibfk_1;
@@ -89,11 +108,13 @@ public class Keys {
 	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.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.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = ForeignKeys0.clanAlliances_ibfk_2;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = ForeignKeys0.clanAlliances_ibfk_1;
+	public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = ForeignKeys0.clanTerritory_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.GamePlayersRecord, mineplex.database.tables.records.GamesRecord> FK_gamePlayers_games = ForeignKeys0.FK_gamePlayers_games;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.GamePlayersRecord, mineplex.database.tables.records.AccountsRecord> FK_gamePlayers_accounts = ForeignKeys0.FK_gamePlayers_accounts;
 	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.RewardLogRecord, mineplex.database.tables.records.AccountsRecord> rewardLog_ibfk_1 = ForeignKeys0.rewardLog_ibfk_1;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.TournamentLeaderboardRecord, mineplex.database.tables.records.AccountsRecord> FK_tournamentLeaderboard_accounts = ForeignKeys0.FK_tournamentLeaderboard_accounts;
 
 	// -------------------------------------------------------------------------
@@ -101,6 +122,7 @@ public class Keys {
 	// -------------------------------------------------------------------------
 
 	private static class Identities0 extends org.jooq.impl.AbstractKeys {
+		public static org.jooq.Identity<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> IDENTITY_accountClan = createIdentity(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> IDENTITY_accountCoinTransactions = createIdentity(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountFriendRecord, java.lang.Integer> IDENTITY_accountFriend = createIdentity(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> IDENTITY_accountGemTransactions = createIdentity(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id);
@@ -109,6 +131,13 @@ public class Keys {
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = createIdentity(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> IDENTITY_accounts = createIdentity(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountStatsRecord, java.lang.Integer> IDENTITY_accountStats = createIdentity(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> IDENTITY_clanAlliances = createIdentity(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> IDENTITY_clans = createIdentity(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> IDENTITY_clanTerritory = createIdentity(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> IDENTITY_eloRating = createIdentity(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> IDENTITY_fieldBlock = createIdentity(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> IDENTITY_fieldMonster = createIdentity(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
+		public static org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> IDENTITY_fieldOre = createIdentity(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.GamePlayersRecord, java.lang.Integer> IDENTITY_gamePlayers = createIdentity(mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.GamesRecord, java.lang.Integer> IDENTITY_games = createIdentity(mineplex.database.tables.Games.games, mineplex.database.tables.Games.games.id);
 		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);
@@ -118,13 +147,14 @@ public class Keys {
 		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.RewardLogRecord, java.lang.Integer> IDENTITY_rewardLog = createIdentity(mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.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.StatsRecord, java.lang.Integer> IDENTITY_stats = createIdentity(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.TournamentLeaderboardRecord, java.lang.Integer> IDENTITY_tournamentLeaderboard = createIdentity(mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.id);
 	}
 
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord> KEY_accountClan_PRIMARY = createUniqueKey(mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord> KEY_accountCoinTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_PRIMARY = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord> KEY_accountFriend_uuidIndex = createUniqueKey(mineplex.database.tables.AccountFriend.accountFriend, mineplex.database.tables.AccountFriend.accountFriend.uuidSource, mineplex.database.tables.AccountFriend.accountFriend.uuidTarget);
@@ -139,6 +169,14 @@ public class Keys {
 		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.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.AccountStatsRecord> KEY_accountStats_accountStatIndex = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId, mineplex.database.tables.AccountStats.accountStats.statId);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> KEY_clanAlliances_PRIMARY = createUniqueKey(mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> KEY_clans_PRIMARY = createUniqueKey(mineplex.database.tables.Clans.clans, mineplex.database.tables.Clans.clans.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> KEY_clanTerritory_PRIMARY = createUniqueKey(mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_PRIMARY = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> KEY_eloRating_uuid_gameType_index = createUniqueKey(mineplex.database.tables.EloRating.eloRating, mineplex.database.tables.EloRating.eloRating.uuid, mineplex.database.tables.EloRating.eloRating.gameType);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> KEY_fieldBlock_PRIMARY = createUniqueKey(mineplex.database.tables.FieldBlock.fieldBlock, mineplex.database.tables.FieldBlock.fieldBlock.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> KEY_fieldMonster_PRIMARY = createUniqueKey(mineplex.database.tables.FieldMonster.fieldMonster, mineplex.database.tables.FieldMonster.fieldMonster.id);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> KEY_fieldOre_PRIMARY = createUniqueKey(mineplex.database.tables.FieldOre.fieldOre, mineplex.database.tables.FieldOre.fieldOre.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GamePlayersRecord> KEY_gamePlayers_PRIMARY = createUniqueKey(mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.GamesRecord> KEY_games_PRIMARY = createUniqueKey(mineplex.database.tables.Games.games, mineplex.database.tables.Games.games.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemCategoriesRecord> KEY_itemCategories_PRIMARY = createUniqueKey(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
@@ -151,8 +189,8 @@ public class Keys {
 		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.RewardLogRecord> KEY_rewardLog_PRIMARY = createUniqueKey(mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.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.StatsRecord> KEY_stats_PRIMARY = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatsRecord> KEY_stats_nameIndex = createUniqueKey(mineplex.database.tables.Stats.stats, mineplex.database.tables.Stats.stats.name);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.TournamentLeaderboardRecord> KEY_tournamentLeaderboard_PRIMARY = createUniqueKey(mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.id);
@@ -160,6 +198,8 @@ public class Keys {
 	}
 
 	private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys {
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.AccountsRecord> accountClan_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.accountId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, mineplex.database.tables.records.ClansRecord> accountClan_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.AccountClan.accountClan, mineplex.database.tables.AccountClan.accountClan.clanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountCoinTransactions_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_uuidIndex, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accounts_uuid);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, mineplex.database.tables.records.AccountsRecord> accountGemTransactions_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_uuidIndex, mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.accounts_uuid);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.AccountsRecord> accountInventory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId);
@@ -168,11 +208,13 @@ public class Keys {
 		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.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.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.clanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, mineplex.database.tables.records.ClansRecord> clanAlliances_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanAlliances.clanAlliances, mineplex.database.tables.ClanAlliances.clanAlliances.otherClanId);
+		public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClansRecord> clanTerritory_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_clans_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.clanId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.GamePlayersRecord, mineplex.database.tables.records.GamesRecord> FK_gamePlayers_games = createForeignKey(mineplex.database.Keys.KEY_games_PRIMARY, mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.gameId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.GamePlayersRecord, mineplex.database.tables.records.AccountsRecord> FK_gamePlayers_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.GamePlayers.gamePlayers, mineplex.database.tables.GamePlayers.gamePlayers.accountId);
 		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.RewardLogRecord, mineplex.database.tables.records.AccountsRecord> rewardLog_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RewardLog.rewardLog, mineplex.database.tables.RewardLog.rewardLog.accountId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.TournamentLeaderboardRecord, mineplex.database.tables.records.AccountsRecord> FK_tournamentLeaderboard_accounts = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard, mineplex.database.tables.TournamentLeaderboard.tournamentLeaderboard.accountId);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/Routines.java

@@ -0,0 +1,37 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * Convenience access to all stored procedures and functions in Account
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Routines {
+
+	/**
+	 * Call <code>Account.playerLogin</code>
+	 */
+	public static void callPlayerlogin(org.jooq.Configuration configuration, java.lang.String paramUuid, java.lang.String paramName) {
+		mineplex.database.routines.PlayerLogin p = new mineplex.database.routines.PlayerLogin();
+		p.setParamUuid(paramUuid);
+		p.setParamName(paramName);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call <code>Account.test</code>
+	 */
+	public static void callTest(org.jooq.Configuration configuration, java.lang.String playerUuid, java.lang.String playerName) {
+		mineplex.database.routines.Test p = new mineplex.database.routines.Test();
+		p.setPlayerUuid(playerUuid);
+		p.setPlayerName(playerName);
+
+		p.execute(configuration);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/Tables.java

@@ -13,6 +13,11 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {
 
+	/**
+	 * The table Account.accountClan
+	 */
+	public static final mineplex.database.tables.AccountClan accountClan = mineplex.database.tables.AccountClan.accountClan;
+
 	/**
 	 * The table Account.accountCoinTransactions
 	 */
@@ -53,6 +58,41 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.AccountStats accountStats = mineplex.database.tables.AccountStats.accountStats;
 
+	/**
+	 * The table Account.clanAlliances
+	 */
+	public static final mineplex.database.tables.ClanAlliances clanAlliances = mineplex.database.tables.ClanAlliances.clanAlliances;
+
+	/**
+	 * The table Account.clans
+	 */
+	public static final mineplex.database.tables.Clans clans = mineplex.database.tables.Clans.clans;
+
+	/**
+	 * The table Account.clanTerritory
+	 */
+	public static final mineplex.database.tables.ClanTerritory clanTerritory = mineplex.database.tables.ClanTerritory.clanTerritory;
+
+	/**
+	 * The table Account.eloRating
+	 */
+	public static final mineplex.database.tables.EloRating eloRating = mineplex.database.tables.EloRating.eloRating;
+
+	/**
+	 * The table Account.fieldBlock
+	 */
+	public static final mineplex.database.tables.FieldBlock fieldBlock = mineplex.database.tables.FieldBlock.fieldBlock;
+
+	/**
+	 * The table Account.fieldMonster
+	 */
+	public static final mineplex.database.tables.FieldMonster fieldMonster = mineplex.database.tables.FieldMonster.fieldMonster;
+
+	/**
+	 * The table Account.fieldOre
+	 */
+	public static final mineplex.database.tables.FieldOre fieldOre = mineplex.database.tables.FieldOre.fieldOre;
+
 	/**
 	 * The table Account.gamePlayers
 	 */
@@ -98,16 +138,16 @@ public class Tables {
 	 */
 	public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits;
 
-	/**
-	 * The table Account.rewardLog
-	 */
-	public static final mineplex.database.tables.RewardLog rewardLog = mineplex.database.tables.RewardLog.rewardLog;
-
 	/**
 	 * The table Account.serverPassword
 	 */
 	public static final mineplex.database.tables.ServerPassword serverPassword = mineplex.database.tables.ServerPassword.serverPassword;
 
+	/**
+	 * The table Account.spawns
+	 */
+	public static final mineplex.database.tables.Spawns spawns = mineplex.database.tables.Spawns.spawns;
+
 	/**
 	 * The table Account.stats
 	 */

Plugins/Mineplex.Database/src/mineplex/database/routines/PlayerLogin.java

@@ -0,0 +1,49 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class PlayerLogin extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -618560530;
+
+	/**
+	 * The parameter <code>Account.playerLogin.paramUuid</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> paramUuid = createParameter("paramUuid", org.jooq.impl.SQLDataType.VARCHAR.length(100));
+
+	/**
+	 * The parameter <code>Account.playerLogin.paramName</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> paramName = createParameter("paramName", org.jooq.impl.SQLDataType.VARCHAR.length(100));
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public PlayerLogin() {
+		super("playerLogin", mineplex.database.Account.Account);
+
+		addInParameter(paramUuid);
+		addInParameter(paramName);
+	}
+
+	/**
+	 * Set the <code>paramUuid</code> parameter IN value to the routine
+	 */
+	public void setParamUuid(java.lang.String value) {
+		setValue(mineplex.database.routines.PlayerLogin.paramUuid, value);
+	}
+
+	/**
+	 * Set the <code>paramName</code> parameter IN value to the routine
+	 */
+	public void setParamName(java.lang.String value) {
+		setValue(mineplex.database.routines.PlayerLogin.paramName, value);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/routines/Test.java

@@ -0,0 +1,49 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.routines;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Test extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1213382298;
+
+	/**
+	 * The parameter <code>Account.test.playerUuid</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> playerUuid = createParameter("playerUuid", org.jooq.impl.SQLDataType.VARCHAR.length(100));
+
+	/**
+	 * The parameter <code>Account.test.playerName</code>.
+	 */
+	public static final org.jooq.Parameter<java.lang.String> playerName = createParameter("playerName", org.jooq.impl.SQLDataType.VARCHAR.length(100));
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public Test() {
+		super("test", mineplex.database.Account.Account);
+
+		addInParameter(playerUuid);
+		addInParameter(playerName);
+	}
+
+	/**
+	 * Set the <code>playerUuid</code> parameter IN value to the routine
+	 */
+	public void setPlayerUuid(java.lang.String value) {
+		setValue(mineplex.database.routines.Test.playerUuid, value);
+	}
+
+	/**
+	 * Set the <code>playerName</code> parameter IN value to the routine
+	 */
+	public void setPlayerName(java.lang.String value) {
+		setValue(mineplex.database.routines.Test.playerName, value);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/AccountClan.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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountClan extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountClanRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 315735493;
+
+	/**
+	 * The singleton instance of <code>Account.accountClan</code>
+	 */
+	public static final mineplex.database.tables.AccountClan accountClan = new mineplex.database.tables.AccountClan();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.AccountClanRecord> getRecordType() {
+		return mineplex.database.tables.records.AccountClanRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.accountClan.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountClan.accountId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.accountClan.clanId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.accountClan.clanRole</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountClanRecord, java.lang.String> clanRole = createField("clanRole", org.jooq.impl.SQLDataType.VARCHAR.length(140), this, "");
+
+	/**
+	 * Create a <code>Account.accountClan</code> table reference
+	 */
+	public AccountClan() {
+		this("accountClan", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.accountClan</code> table reference
+	 */
+	public AccountClan(java.lang.String alias) {
+		this(alias, mineplex.database.tables.AccountClan.accountClan);
+	}
+
+	private AccountClan(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountClanRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private AccountClan(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountClanRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.AccountClanRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_accountClan;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_accountClan_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountClanRecord>>asList(mineplex.database.Keys.KEY_accountClan_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountClanRecord, ?>>asList(mineplex.database.Keys.accountClan_ibfk_1, mineplex.database.Keys.accountClan_ibfk_2);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.AccountClan as(java.lang.String alias) {
+		return new mineplex.database.tables.AccountClan(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.AccountClan rename(java.lang.String name) {
+		return new mineplex.database.tables.AccountClan(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/Accounts.java

@@ -11,7 +11,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Accounts extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountsRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1971089065;
+	private static final long serialVersionUID = 1365067279;
 
 	/**
 	 * The singleton instance of <code>Account.accounts</code>
@@ -46,6 +46,11 @@ public class Accounts extends org.jooq.impl.TableImpl<mineplex.database.tables.r
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER.defaulted(true), this, "");
 
+	/**
+	 * The column <code>Account.accounts.gold</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> gold = createField("gold", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
+
 	/**
 	 * The column <code>Account.accounts.coins</code>.
 	 */

Plugins/Mineplex.Database/src/mineplex/database/tables/ClanAlliances.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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ClanAlliances extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClanAlliancesRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -1575594;
+
+	/**
+	 * The singleton instance of <code>Account.clanAlliances</code>
+	 */
+	public static final mineplex.database.tables.ClanAlliances clanAlliances = new mineplex.database.tables.ClanAlliances();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.ClanAlliancesRecord> getRecordType() {
+		return mineplex.database.tables.records.ClanAlliancesRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.clanAlliances.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.clanAlliances.clanId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.clanAlliances.otherClanId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> otherClanId = createField("otherClanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.clanAlliances.trusted</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Byte> trusted = createField("trusted", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * Create a <code>Account.clanAlliances</code> table reference
+	 */
+	public ClanAlliances() {
+		this("clanAlliances", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.clanAlliances</code> table reference
+	 */
+	public ClanAlliances(java.lang.String alias) {
+		this(alias, mineplex.database.tables.ClanAlliances.clanAlliances);
+	}
+
+	private ClanAlliances(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClanAlliancesRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private ClanAlliances(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClanAlliancesRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.ClanAlliancesRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_clanAlliances;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_clanAlliances_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClanAlliancesRecord>>asList(mineplex.database.Keys.KEY_clanAlliances_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.ClanAlliancesRecord, ?>>asList(mineplex.database.Keys.clanAlliances_ibfk_2, mineplex.database.Keys.clanAlliances_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.ClanAlliances as(java.lang.String alias) {
+		return new mineplex.database.tables.ClanAlliances(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.ClanAlliances rename(java.lang.String name) {
+		return new mineplex.database.tables.ClanAlliances(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/ClanTerritory.java

@@ -0,0 +1,122 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ClanTerritory extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClanTerritoryRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1558301281;
+
+	/**
+	 * The singleton instance of <code>Account.clanTerritory</code>
+	 */
+	public static final mineplex.database.tables.ClanTerritory clanTerritory = new mineplex.database.tables.ClanTerritory();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.ClanTerritoryRecord> getRecordType() {
+		return mineplex.database.tables.records.ClanTerritoryRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.clanTerritory.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.clanTerritory.clanId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> clanId = createField("clanId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.clanTerritory.serverName</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.String> serverName = createField("serverName", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.clanTerritory.chunk</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.String> chunk = createField("chunk", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.clanTerritory.safe</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Byte> safe = createField("safe", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * Create a <code>Account.clanTerritory</code> table reference
+	 */
+	public ClanTerritory() {
+		this("clanTerritory", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.clanTerritory</code> table reference
+	 */
+	public ClanTerritory(java.lang.String alias) {
+		this(alias, mineplex.database.tables.ClanTerritory.clanTerritory);
+	}
+
+	private ClanTerritory(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClanTerritoryRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private ClanTerritory(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClanTerritoryRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.ClanTerritoryRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_clanTerritory;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_clanTerritory_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClanTerritoryRecord>>asList(mineplex.database.Keys.KEY_clanTerritory_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, ?>>asList(mineplex.database.Keys.clanTerritory_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.ClanTerritory as(java.lang.String alias) {
+		return new mineplex.database.tables.ClanTerritory(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.ClanTerritory rename(java.lang.String name) {
+		return new mineplex.database.tables.ClanTerritory(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java

@@ -0,0 +1,129 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@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 = 1832873693;
+
+	/**
+	 * The singleton instance of <code>Account.clans</code>
+	 */
+	public static final mineplex.database.tables.Clans clans = new mineplex.database.tables.Clans();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.ClansRecord> getRecordType() {
+		return mineplex.database.tables.records.ClansRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.clans.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.clans.serverName</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> serverName = createField("serverName", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.clans.name</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> name = createField("name", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.clans.description</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> description = createField("description", org.jooq.impl.SQLDataType.VARCHAR.length(140), this, "");
+
+	/**
+	 * The column <code>Account.clans.home</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> home = createField("home", org.jooq.impl.SQLDataType.VARCHAR.length(140), this, "");
+
+	/**
+	 * The column <code>Account.clans.admin</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Byte> admin = createField("admin", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.clans.dateCreated</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> dateCreated = createField("dateCreated", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, "");
+
+	/**
+	 * The column <code>Account.clans.lastOnline</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.String> lastOnline = createField("lastOnline", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, "");
+
+	/**
+	 * Create a <code>Account.clans</code> table reference
+	 */
+	public Clans() {
+		this("clans", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.clans</code> table reference
+	 */
+	public Clans(java.lang.String alias) {
+		this(alias, mineplex.database.tables.Clans.clans);
+	}
+
+	private Clans(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClansRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Clans(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.ClansRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.ClansRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_clans;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_clans_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.ClansRecord>>asList(mineplex.database.Keys.KEY_clans_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.Clans as(java.lang.String alias) {
+		return new mineplex.database.tables.Clans(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.Clans rename(java.lang.String name) {
+		return new mineplex.database.tables.Clans(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/EloRating.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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class EloRating extends org.jooq.impl.TableImpl<mineplex.database.tables.records.EloRatingRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1917946711;
+
+	/**
+	 * The singleton instance of <code>Account.eloRating</code>
+	 */
+	public static final mineplex.database.tables.EloRating eloRating = new mineplex.database.tables.EloRating();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.EloRatingRecord> getRecordType() {
+		return mineplex.database.tables.records.EloRatingRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.eloRating.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.eloRating.uuid</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> uuid = createField("uuid", org.jooq.impl.SQLDataType.VARCHAR.length(256), this, "");
+
+	/**
+	 * The column <code>Account.eloRating.gameType</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.String> gameType = createField("gameType", org.jooq.impl.SQLDataType.VARCHAR.length(256), this, "");
+
+	/**
+	 * The column <code>Account.eloRating.elo</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> elo = createField("elo", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * Create a <code>Account.eloRating</code> table reference
+	 */
+	public EloRating() {
+		this("eloRating", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.eloRating</code> table reference
+	 */
+	public EloRating(java.lang.String alias) {
+		this(alias, mineplex.database.tables.EloRating.eloRating);
+	}
+
+	private EloRating(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.EloRatingRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private EloRating(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.EloRatingRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.EloRatingRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_eloRating;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_eloRating_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.EloRatingRecord>>asList(mineplex.database.Keys.KEY_eloRating_PRIMARY, mineplex.database.Keys.KEY_eloRating_uuid_gameType_index);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.EloRating as(java.lang.String alias) {
+		return new mineplex.database.tables.EloRating(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.EloRating rename(java.lang.String name) {
+		return new mineplex.database.tables.EloRating(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/FieldBlock.java

@@ -0,0 +1,139 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldBlock extends org.jooq.impl.TableImpl<mineplex.database.tables.records.FieldBlockRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = -733741704;
+
+	/**
+	 * The singleton instance of <code>Account.fieldBlock</code>
+	 */
+	public static final mineplex.database.tables.FieldBlock fieldBlock = new mineplex.database.tables.FieldBlock();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.FieldBlockRecord> getRecordType() {
+		return mineplex.database.tables.records.FieldBlockRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.fieldBlock.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.server</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.String> server = createField("server", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.location</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.String> location = createField("location", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.blockId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> blockId = createField("blockId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.blockData</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Byte> blockData = createField("blockData", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.emptyId</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> emptyId = createField("emptyId", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.emptyData</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Byte> emptyData = createField("emptyData", org.jooq.impl.SQLDataType.TINYINT, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.stockMax</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> stockMax = createField("stockMax", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.stockRegenTime</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.Double> stockRegenTime = createField("stockRegenTime", org.jooq.impl.SQLDataType.DOUBLE, this, "");
+
+	/**
+	 * The column <code>Account.fieldBlock.loot</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldBlockRecord, java.lang.String> loot = createField("loot", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * Create a <code>Account.fieldBlock</code> table reference
+	 */
+	public FieldBlock() {
+		this("fieldBlock", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.fieldBlock</code> table reference
+	 */
+	public FieldBlock(java.lang.String alias) {
+		this(alias, mineplex.database.tables.FieldBlock.fieldBlock);
+	}
+
+	private FieldBlock(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldBlockRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private FieldBlock(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldBlockRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.FieldBlockRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_fieldBlock;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_fieldBlock_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.FieldBlockRecord>>asList(mineplex.database.Keys.KEY_fieldBlock_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.FieldBlock as(java.lang.String alias) {
+		return new mineplex.database.tables.FieldBlock(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.FieldBlock rename(java.lang.String name) {
+		return new mineplex.database.tables.FieldBlock(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/FieldMonster.java

@@ -0,0 +1,134 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldMonster extends org.jooq.impl.TableImpl<mineplex.database.tables.records.FieldMonsterRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 1054960206;
+
+	/**
+	 * The singleton instance of <code>Account.fieldMonster</code>
+	 */
+	public static final mineplex.database.tables.FieldMonster fieldMonster = new mineplex.database.tables.FieldMonster();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.FieldMonsterRecord> getRecordType() {
+		return mineplex.database.tables.records.FieldMonsterRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.fieldMonster.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.server</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.String> server = createField("server", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.name</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.String> name = createField("name", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.type</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.String> type = createField("type", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.mobMax</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> mobMax = createField("mobMax", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.mobRate</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Double> mobRate = createField("mobRate", org.jooq.impl.SQLDataType.DOUBLE, this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.center</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.String> center = createField("center", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.radius</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> radius = createField("radius", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * The column <code>Account.fieldMonster.height</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> height = createField("height", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * Create a <code>Account.fieldMonster</code> table reference
+	 */
+	public FieldMonster() {
+		this("fieldMonster", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.fieldMonster</code> table reference
+	 */
+	public FieldMonster(java.lang.String alias) {
+		this(alias, mineplex.database.tables.FieldMonster.fieldMonster);
+	}
+
+	private FieldMonster(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldMonsterRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private FieldMonster(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldMonsterRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.FieldMonsterRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_fieldMonster;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_fieldMonster_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.FieldMonsterRecord>>asList(mineplex.database.Keys.KEY_fieldMonster_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.FieldMonster as(java.lang.String alias) {
+		return new mineplex.database.tables.FieldMonster(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.FieldMonster rename(java.lang.String name) {
+		return new mineplex.database.tables.FieldMonster(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/FieldOre.java

@@ -0,0 +1,104 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldOre extends org.jooq.impl.TableImpl<mineplex.database.tables.records.FieldOreRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 2965632;
+
+	/**
+	 * The singleton instance of <code>Account.fieldOre</code>
+	 */
+	public static final mineplex.database.tables.FieldOre fieldOre = new mineplex.database.tables.FieldOre();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.FieldOreRecord> getRecordType() {
+		return mineplex.database.tables.records.FieldOreRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.fieldOre.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.fieldOre.server</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldOreRecord, java.lang.String> server = createField("server", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.fieldOre.location</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.FieldOreRecord, java.lang.String> location = createField("location", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * Create a <code>Account.fieldOre</code> table reference
+	 */
+	public FieldOre() {
+		this("fieldOre", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.fieldOre</code> table reference
+	 */
+	public FieldOre(java.lang.String alias) {
+		this(alias, mineplex.database.tables.FieldOre.fieldOre);
+	}
+
+	private FieldOre(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldOreRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private FieldOre(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.FieldOreRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.FieldOreRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_fieldOre;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_fieldOre_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.FieldOreRecord>>asList(mineplex.database.Keys.KEY_fieldOre_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.FieldOre as(java.lang.String alias) {
+		return new mineplex.database.tables.FieldOre(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.FieldOre rename(java.lang.String name) {
+		return new mineplex.database.tables.FieldOre(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/RewardLog.java

@@ -1,127 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package mineplex.database.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class RewardLog extends org.jooq.impl.TableImpl<mineplex.database.tables.records.RewardLogRecord> implements java.io.Serializable, java.lang.Cloneable {
-
-	private static final long serialVersionUID = 503144315;
-
-	/**
-	 * The singleton instance of <code>Account.rewardLog</code>
-	 */
-	public static final mineplex.database.tables.RewardLog rewardLog = new mineplex.database.tables.RewardLog();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<mineplex.database.tables.records.RewardLogRecord> getRecordType() {
-		return mineplex.database.tables.records.RewardLogRecord.class;
-	}
-
-	/**
-	 * The column <code>Account.rewardLog.id</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
-
-	/**
-	 * The column <code>Account.rewardLog.accountId</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
-
-	/**
-	 * The column <code>Account.rewardLog.date</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.sql.Timestamp> date = createField("date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, "");
-
-	/**
-	 * The column <code>Account.rewardLog.type</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.lang.String> type = createField("type", org.jooq.impl.SQLDataType.VARCHAR.length(16).nullable(false), this, "");
-
-	/**
-	 * The column <code>Account.rewardLog.rarity</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.lang.String> rarity = createField("rarity", org.jooq.impl.SQLDataType.VARCHAR.length(16).nullable(false), this, "");
-
-	/**
-	 * The column <code>Account.rewardLog.reward</code>.
-	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.RewardLogRecord, java.lang.String> reward = createField("reward", org.jooq.impl.SQLDataType.VARCHAR.length(64).nullable(false), this, "");
-
-	/**
-	 * Create a <code>Account.rewardLog</code> table reference
-	 */
-	public RewardLog() {
-		this("rewardLog", null);
-	}
-
-	/**
-	 * Create an aliased <code>Account.rewardLog</code> table reference
-	 */
-	public RewardLog(java.lang.String alias) {
-		this(alias, mineplex.database.tables.RewardLog.rewardLog);
-	}
-
-	private RewardLog(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RewardLogRecord> aliased) {
-		this(alias, aliased, null);
-	}
-
-	private RewardLog(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RewardLogRecord> aliased, org.jooq.Field<?>[] parameters) {
-		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Identity<mineplex.database.tables.records.RewardLogRecord, java.lang.Integer> getIdentity() {
-		return mineplex.database.Keys.IDENTITY_rewardLog;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.UniqueKey<mineplex.database.tables.records.RewardLogRecord> getPrimaryKey() {
-		return mineplex.database.Keys.KEY_rewardLog_PRIMARY;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.RewardLogRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.RewardLogRecord>>asList(mineplex.database.Keys.KEY_rewardLog_PRIMARY);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.RewardLogRecord, ?>> getReferences() {
-		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.RewardLogRecord, ?>>asList(mineplex.database.Keys.rewardLog_ibfk_1);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public mineplex.database.tables.RewardLog as(java.lang.String alias) {
-		return new mineplex.database.tables.RewardLog(alias, this);
-	}
-
-	/**
-	 * Rename this table
-	 */
-	public mineplex.database.tables.RewardLog rename(java.lang.String name) {
-		return new mineplex.database.tables.RewardLog(name, null);
-	}
-}

Plugins/Mineplex.Database/src/mineplex/database/tables/Spawns.java

@@ -0,0 +1,104 @@
+/**
+ * This class is generated by jOOQ
+ */
+package mineplex.database.tables;
+
+/**
+ * This class is generated by jOOQ.
+ */
+@javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Spawns extends org.jooq.impl.TableImpl<mineplex.database.tables.records.SpawnsRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 462825675;
+
+	/**
+	 * The singleton instance of <code>Account.spawns</code>
+	 */
+	public static final mineplex.database.tables.Spawns spawns = new mineplex.database.tables.Spawns();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.SpawnsRecord> getRecordType() {
+		return mineplex.database.tables.records.SpawnsRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.spawns.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.spawns.serverName</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.SpawnsRecord, java.lang.String> serverName = createField("serverName", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.spawns.location</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.SpawnsRecord, java.lang.String> location = createField("location", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * Create a <code>Account.spawns</code> table reference
+	 */
+	public Spawns() {
+		this("spawns", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.spawns</code> table reference
+	 */
+	public Spawns(java.lang.String alias) {
+		this(alias, mineplex.database.tables.Spawns.spawns);
+	}
+
+	private Spawns(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.SpawnsRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private Spawns(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.SpawnsRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_spawns;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_spawns_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord>>asList(mineplex.database.Keys.KEY_spawns_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.Spawns as(java.lang.String alias) {
+		return new mineplex.database.tables.Spawns(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.Spawns rename(java.lang.String name) {
+		return new mineplex.database.tables.Spawns(name, null);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountClanRecord.java

@@ -0,0 +1,234 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AccountClanRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountClanRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String> {
+
+	private static final long serialVersionUID = 1048240243;
+
+	/**
+	 * Setter for <code>Account.accountClan.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountClan.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.accountClan.accountId</code>.
+	 */
+	public void setAccountId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountClan.accountId</code>.
+	 */
+	public java.lang.Integer getAccountId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.accountClan.clanId</code>.
+	 */
+	public void setClanId(java.lang.Integer value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountClan.clanId</code>.
+	 */
+	public java.lang.Integer getClanId() {
+		return (java.lang.Integer) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.accountClan.clanRole</code>.
+	 */
+	public void setClanRole(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountClan.clanRole</code>.
+	 */
+	public java.lang.String getClanRole() {
+		return (java.lang.String) getValue(3);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record4 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String> fieldsRow() {
+		return (org.jooq.Row4) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String> valuesRow() {
+		return (org.jooq.Row4) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.AccountClan.accountClan.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.AccountClan.accountClan.accountId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field3() {
+		return mineplex.database.tables.AccountClan.accountClan.clanId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.AccountClan.accountClan.clanRole;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getAccountId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value3() {
+		return getClanId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getClanRole();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountClanRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountClanRecord value2(java.lang.Integer value) {
+		setAccountId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountClanRecord value3(java.lang.Integer value) {
+		setClanId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountClanRecord value4(java.lang.String value) {
+		setClanRole(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountClanRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.String value4) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached AccountClanRecord
+	 */
+	public AccountClanRecord() {
+		super(mineplex.database.tables.AccountClan.accountClan);
+	}
+
+	/**
+	 * Create a detached, initialised AccountClanRecord
+	 */
+	public AccountClanRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.Integer clanId, java.lang.String clanRole) {
+		super(mineplex.database.tables.AccountClan.accountClan);
+
+		setValue(0, id);
+		setValue(1, accountId);
+		setValue(2, clanId);
+		setValue(3, clanRole);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountsRecord.java

@@ -9,9 +9,9 @@ package mineplex.database.tables.records;
 @javax.annotation.Generated(value    = { "http://www.jooq.org", "3.4.2" },
                             comments = "This class is generated by jOOQ")
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record11<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> {
+public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record12<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> {
 
-	private static final long serialVersionUID = -1996366804;
+	private static final long serialVersionUID = 973515906;
 
 	/**
 	 * Setter for <code>Account.accounts.id</code>.
@@ -69,102 +69,116 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 		return (java.lang.Integer) getValue(3);
 	}
 
+	/**
+	 * Setter for <code>Account.accounts.gold</code>.
+	 */
+	public void setGold(java.lang.Integer value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accounts.gold</code>.
+	 */
+	public java.lang.Integer getGold() {
+		return (java.lang.Integer) getValue(4);
+	}
+
 	/**
 	 * Setter for <code>Account.accounts.coins</code>.
 	 */
 	public void setCoins(java.lang.Integer value) {
-		setValue(4, value);
+		setValue(5, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.coins</code>.
 	 */
 	public java.lang.Integer getCoins() {
-		return (java.lang.Integer) getValue(4);
+		return (java.lang.Integer) getValue(5);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.donorRank</code>.
 	 */
 	public void setDonorRank(java.lang.String value) {
-		setValue(5, value);
+		setValue(6, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.donorRank</code>.
 	 */
 	public java.lang.String getDonorRank() {
-		return (java.lang.String) getValue(5);
+		return (java.lang.String) getValue(6);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rank</code>.
 	 */
 	public void setRank(java.lang.String value) {
-		setValue(6, value);
+		setValue(7, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rank</code>.
 	 */
 	public java.lang.String getRank() {
-		return (java.lang.String) getValue(6);
+		return (java.lang.String) getValue(7);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rankPerm</code>.
 	 */
 	public void setRankPerm(java.lang.Byte value) {
-		setValue(7, value);
+		setValue(8, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rankPerm</code>.
 	 */
 	public java.lang.Byte getRankPerm() {
-		return (java.lang.Byte) getValue(7);
+		return (java.lang.Byte) getValue(8);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rankExpire</code>.
 	 */
 	public void setRankExpire(java.sql.Timestamp value) {
-		setValue(8, value);
+		setValue(9, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rankExpire</code>.
 	 */
 	public java.sql.Timestamp getRankExpire() {
-		return (java.sql.Timestamp) getValue(8);
+		return (java.sql.Timestamp) getValue(9);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.lastLogin</code>.
 	 */
 	public void setLastLogin(java.sql.Timestamp value) {
-		setValue(9, value);
+		setValue(10, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.lastLogin</code>.
 	 */
 	public java.sql.Timestamp getLastLogin() {
-		return (java.sql.Timestamp) getValue(9);
+		return (java.sql.Timestamp) getValue(10);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.totalPlayTime</code>.
 	 */
 	public void setTotalPlayTime(java.lang.String value) {
-		setValue(10, value);
+		setValue(11, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.totalPlayTime</code>.
 	 */
 	public java.lang.String getTotalPlayTime() {
-		return (java.lang.String) getValue(10);
+		return (java.lang.String) getValue(11);
 	}
 
 	// -------------------------------------------------------------------------
@@ -180,23 +194,23 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	}
 
 	// -------------------------------------------------------------------------
-	// Record11 type implementation
+	// Record12 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row11<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> fieldsRow() {
+	public org.jooq.Row12<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> fieldsRow() {
-		return (org.jooq.Row11) super.fieldsRow();
+		return (org.jooq.Row12) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row11<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> valuesRow() {
+	public org.jooq.Row12<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.sql.Timestamp, java.sql.Timestamp, java.lang.String> valuesRow() {
-		return (org.jooq.Row11) super.valuesRow();
+		return (org.jooq.Row12) super.valuesRow();
 	}
 
 	/**
@@ -236,6 +250,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public org.jooq.Field<java.lang.Integer> field5() {
+		return mineplex.database.tables.Accounts.accounts.gold;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field6() {
 		return mineplex.database.tables.Accounts.accounts.coins;
 	}
 
@@ -243,7 +265,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field6() {
+	public org.jooq.Field<java.lang.String> field7() {
 		return mineplex.database.tables.Accounts.accounts.donorRank;
 	}
 
@@ -251,7 +273,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field7() {
+	public org.jooq.Field<java.lang.String> field8() {
 		return mineplex.database.tables.Accounts.accounts.rank;
 	}
 
@@ -259,7 +281,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field8() {
+	public org.jooq.Field<java.lang.Byte> field9() {
 		return mineplex.database.tables.Accounts.accounts.rankPerm;
 	}
 
@@ -267,7 +289,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.sql.Timestamp> field9() {
+	public org.jooq.Field<java.sql.Timestamp> field10() {
 		return mineplex.database.tables.Accounts.accounts.rankExpire;
 	}
 
@@ -275,7 +297,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.sql.Timestamp> field10() {
+	public org.jooq.Field<java.sql.Timestamp> field11() {
 		return mineplex.database.tables.Accounts.accounts.lastLogin;
 	}
 
@@ -283,7 +305,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field11() {
+	public org.jooq.Field<java.lang.String> field12() {
 		return mineplex.database.tables.Accounts.accounts.totalPlayTime;
 	}
 
@@ -324,6 +346,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public java.lang.Integer value5() {
+		return getGold();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value6() {
 		return getCoins();
 	}
 
@@ -331,7 +361,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value6() {
+	public java.lang.String value7() {
 		return getDonorRank();
 	}
 
@@ -339,7 +369,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value7() {
+	public java.lang.String value8() {
 		return getRank();
 	}
 
@@ -347,7 +377,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value8() {
+	public java.lang.Byte value9() {
 		return getRankPerm();
 	}
 
@@ -355,7 +385,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value9() {
+	public java.sql.Timestamp value10() {
 		return getRankExpire();
 	}
 
@@ -363,7 +393,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value10() {
+	public java.sql.Timestamp value11() {
 		return getLastLogin();
 	}
 
@@ -371,7 +401,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value11() {
+	public java.lang.String value12() {
 		return getTotalPlayTime();
 	}
 
@@ -416,6 +446,15 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public AccountsRecord value5(java.lang.Integer value) {
+		setGold(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountsRecord value6(java.lang.Integer value) {
 		setCoins(value);
 		return this;
 	}
@@ -424,7 +463,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value6(java.lang.String value) {
+	public AccountsRecord value7(java.lang.String value) {
 		setDonorRank(value);
 		return this;
 	}
@@ -433,7 +472,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value7(java.lang.String value) {
+	public AccountsRecord value8(java.lang.String value) {
 		setRank(value);
 		return this;
 	}
@@ -442,7 +481,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value8(java.lang.Byte value) {
+	public AccountsRecord value9(java.lang.Byte value) {
 		setRankPerm(value);
 		return this;
 	}
@@ -451,7 +490,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value9(java.sql.Timestamp value) {
+	public AccountsRecord value10(java.sql.Timestamp value) {
 		setRankExpire(value);
 		return this;
 	}
@@ -460,7 +499,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value10(java.sql.Timestamp value) {
+	public AccountsRecord value11(java.sql.Timestamp value) {
 		setLastLogin(value);
 		return this;
 	}
@@ -469,7 +508,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value11(java.lang.String value) {
+	public AccountsRecord value12(java.lang.String value) {
 		setTotalPlayTime(value);
 		return this;
 	}
@@ -478,7 +517,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4, java.lang.Integer value5, java.lang.String value6, java.lang.String value7, java.lang.Byte value8, java.sql.Timestamp value9, java.sql.Timestamp value10, java.lang.String value11) {
+	public AccountsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4, java.lang.Integer value5, java.lang.Integer value6, java.lang.String value7, java.lang.String value8, java.lang.Byte value9, java.sql.Timestamp value10, java.sql.Timestamp value11, java.lang.String value12) {
 		return this;
 	}
 
@@ -496,19 +535,20 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	/**
 	 * Create a detached, initialised AccountsRecord
 	 */
-	public AccountsRecord(java.lang.Integer id, java.lang.String uuid, java.lang.String name, java.lang.Integer gems, java.lang.Integer coins, java.lang.String donorRank, java.lang.String rank, java.lang.Byte rankPerm, java.sql.Timestamp rankExpire, java.sql.Timestamp lastLogin, java.lang.String totalPlayTime) {
+	public AccountsRecord(java.lang.Integer id, java.lang.String uuid, java.lang.String name, java.lang.Integer gems, java.lang.Integer gold, java.lang.Integer coins, java.lang.String donorRank, java.lang.String rank, java.lang.Byte rankPerm, java.sql.Timestamp rankExpire, java.sql.Timestamp lastLogin, java.lang.String totalPlayTime) {
 		super(mineplex.database.tables.Accounts.accounts);
 
 		setValue(0, id);
 		setValue(1, uuid);
 		setValue(2, name);
 		setValue(3, gems);
-		setValue(4, coins);
+		setValue(4, gold);
-		setValue(5, donorRank);
+		setValue(5, coins);
-		setValue(6, rank);
+		setValue(6, donorRank);
-		setValue(7, rankPerm);
+		setValue(7, rank);
-		setValue(8, rankExpire);
+		setValue(8, rankPerm);
-		setValue(9, lastLogin);
+		setValue(9, rankExpire);
-		setValue(10, totalPlayTime);
+		setValue(10, lastLogin);
+		setValue(11, totalPlayTime);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanAlliancesRecord.java

@@ -0,0 +1,234 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ClanAlliancesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanAlliancesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> {
+
+	private static final long serialVersionUID = 1680956123;
+
+	/**
+	 * Setter for <code>Account.clanAlliances.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanAlliances.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.clanAlliances.clanId</code>.
+	 */
+	public void setClanId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanAlliances.clanId</code>.
+	 */
+	public java.lang.Integer getClanId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.clanAlliances.otherClanId</code>.
+	 */
+	public void setOtherClanId(java.lang.Integer value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanAlliances.otherClanId</code>.
+	 */
+	public java.lang.Integer getOtherClanId() {
+		return (java.lang.Integer) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.clanAlliances.trusted</code>.
+	 */
+	public void setTrusted(java.lang.Byte value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanAlliances.trusted</code>.
+	 */
+	public java.lang.Byte getTrusted() {
+		return (java.lang.Byte) getValue(3);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record4 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> fieldsRow() {
+		return (org.jooq.Row4) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Byte> valuesRow() {
+		return (org.jooq.Row4) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.ClanAlliances.clanAlliances.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.ClanAlliances.clanAlliances.clanId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field3() {
+		return mineplex.database.tables.ClanAlliances.clanAlliances.otherClanId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field4() {
+		return mineplex.database.tables.ClanAlliances.clanAlliances.trusted;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getClanId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value3() {
+		return getOtherClanId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value4() {
+		return getTrusted();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanAlliancesRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanAlliancesRecord value2(java.lang.Integer value) {
+		setClanId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanAlliancesRecord value3(java.lang.Integer value) {
+		setOtherClanId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanAlliancesRecord value4(java.lang.Byte value) {
+		setTrusted(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanAlliancesRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Integer value3, java.lang.Byte value4) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached ClanAlliancesRecord
+	 */
+	public ClanAlliancesRecord() {
+		super(mineplex.database.tables.ClanAlliances.clanAlliances);
+	}
+
+	/**
+	 * Create a detached, initialised ClanAlliancesRecord
+	 */
+	public ClanAlliancesRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.Integer otherClanId, java.lang.Byte trusted) {
+		super(mineplex.database.tables.ClanAlliances.clanAlliances);
+
+		setValue(0, id);
+		setValue(1, clanId);
+		setValue(2, otherClanId);
+		setValue(3, trusted);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClanTerritoryRecord.java

@@ -0,0 +1,274 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class ClanTerritoryRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClanTerritoryRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> {
+
+	private static final long serialVersionUID = -1094018373;
+
+	/**
+	 * Setter for <code>Account.clanTerritory.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanTerritory.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.clanTerritory.clanId</code>.
+	 */
+	public void setClanId(java.lang.Integer value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanTerritory.clanId</code>.
+	 */
+	public java.lang.Integer getClanId() {
+		return (java.lang.Integer) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.clanTerritory.serverName</code>.
+	 */
+	public void setServerName(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanTerritory.serverName</code>.
+	 */
+	public java.lang.String getServerName() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.clanTerritory.chunk</code>.
+	 */
+	public void setChunk(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanTerritory.chunk</code>.
+	 */
+	public java.lang.String getChunk() {
+		return (java.lang.String) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.clanTerritory.safe</code>.
+	 */
+	public void setSafe(java.lang.Byte value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clanTerritory.safe</code>.
+	 */
+	public java.lang.Byte getSafe() {
+		return (java.lang.Byte) getValue(4);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record5 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> fieldsRow() {
+		return (org.jooq.Row5) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row5<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> valuesRow() {
+		return (org.jooq.Row5) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.ClanTerritory.clanTerritory.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field2() {
+		return mineplex.database.tables.ClanTerritory.clanTerritory.clanId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.ClanTerritory.clanTerritory.serverName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.ClanTerritory.clanTerritory.chunk;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field5() {
+		return mineplex.database.tables.ClanTerritory.clanTerritory.safe;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value2() {
+		return getClanId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getServerName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getChunk();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value5() {
+		return getSafe();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord value2(java.lang.Integer value) {
+		setClanId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord value3(java.lang.String value) {
+		setServerName(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord value4(java.lang.String value) {
+		setChunk(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord value5(java.lang.Byte value) {
+		setSafe(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClanTerritoryRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.Byte value5) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached ClanTerritoryRecord
+	 */
+	public ClanTerritoryRecord() {
+		super(mineplex.database.tables.ClanTerritory.clanTerritory);
+	}
+
+	/**
+	 * Create a detached, initialised ClanTerritoryRecord
+	 */
+	public ClanTerritoryRecord(java.lang.Integer id, java.lang.Integer clanId, java.lang.String serverName, java.lang.String chunk, java.lang.Byte safe) {
+		super(mineplex.database.tables.ClanTerritory.clanTerritory);
+
+		setValue(0, id);
+		setValue(1, clanId);
+		setValue(2, serverName);
+		setValue(3, chunk);
+		setValue(4, safe);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java

@@ -0,0 +1,394 @@
+/**
+ * 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", "3.4.2" },
+                            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.Record8<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String> {
+
+	private static final long serialVersionUID = 1671341643;
+
+	/**
+	 * Setter for <code>Account.clans.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.serverName</code>.
+	 */
+	public void setServerName(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.serverName</code>.
+	 */
+	public java.lang.String getServerName() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.name</code>.
+	 */
+	public void setName(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.name</code>.
+	 */
+	public java.lang.String getName() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.description</code>.
+	 */
+	public void setDescription(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.description</code>.
+	 */
+	public java.lang.String getDescription() {
+		return (java.lang.String) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.home</code>.
+	 */
+	public void setHome(java.lang.String value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.home</code>.
+	 */
+	public java.lang.String getHome() {
+		return (java.lang.String) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.admin</code>.
+	 */
+	public void setAdmin(java.lang.Byte value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.admin</code>.
+	 */
+	public java.lang.Byte getAdmin() {
+		return (java.lang.Byte) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.dateCreated</code>.
+	 */
+	public void setDateCreated(java.lang.String value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.dateCreated</code>.
+	 */
+	public java.lang.String getDateCreated() {
+		return (java.lang.String) getValue(6);
+	}
+
+	/**
+	 * Setter for <code>Account.clans.lastOnline</code>.
+	 */
+	public void setLastOnline(java.lang.String value) {
+		setValue(7, value);
+	}
+
+	/**
+	 * Getter for <code>Account.clans.lastOnline</code>.
+	 */
+	public java.lang.String getLastOnline() {
+		return (java.lang.String) getValue(7);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record8 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row8<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String> fieldsRow() {
+		return (org.jooq.Row8) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row8<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.lang.String> valuesRow() {
+		return (org.jooq.Row8) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.Clans.clans.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.Clans.clans.serverName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.Clans.clans.name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.Clans.clans.description;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field5() {
+		return mineplex.database.tables.Clans.clans.home;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field6() {
+		return mineplex.database.tables.Clans.clans.admin;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field7() {
+		return mineplex.database.tables.Clans.clans.dateCreated;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field8() {
+		return mineplex.database.tables.Clans.clans.lastOnline;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getServerName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getDescription();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value5() {
+		return getHome();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value6() {
+		return getAdmin();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value7() {
+		return getDateCreated();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value8() {
+		return getLastOnline();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value2(java.lang.String value) {
+		setServerName(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value3(java.lang.String value) {
+		setName(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value4(java.lang.String value) {
+		setDescription(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value5(java.lang.String value) {
+		setHome(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value6(java.lang.Byte value) {
+		setAdmin(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value7(java.lang.String value) {
+		setDateCreated(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord value8(java.lang.String value) {
+		setLastOnline(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ClansRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Byte value6, java.lang.String value7, java.lang.String value8) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached ClansRecord
+	 */
+	public ClansRecord() {
+		super(mineplex.database.tables.Clans.clans);
+	}
+
+	/**
+	 * Create a detached, initialised ClansRecord
+	 */
+	public ClansRecord(java.lang.Integer id, java.lang.String serverName, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Byte admin, java.lang.String dateCreated, java.lang.String lastOnline) {
+		super(mineplex.database.tables.Clans.clans);
+
+		setValue(0, id);
+		setValue(1, serverName);
+		setValue(2, name);
+		setValue(3, description);
+		setValue(4, home);
+		setValue(5, admin);
+		setValue(6, dateCreated);
+		setValue(7, lastOnline);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/EloRatingRecord.java

@@ -0,0 +1,234 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class EloRatingRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.EloRatingRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> {
+
+	private static final long serialVersionUID = -1820874750;
+
+	/**
+	 * Setter for <code>Account.eloRating.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.eloRating.uuid</code>.
+	 */
+	public void setUuid(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.uuid</code>.
+	 */
+	public java.lang.String getUuid() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.eloRating.gameType</code>.
+	 */
+	public void setGameType(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.gameType</code>.
+	 */
+	public java.lang.String getGameType() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.eloRating.elo</code>.
+	 */
+	public void setElo(java.lang.Integer value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.eloRating.elo</code>.
+	 */
+	public java.lang.Integer getElo() {
+		return (java.lang.Integer) getValue(3);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record4 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row4) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row4) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.EloRating.eloRating.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.EloRating.eloRating.uuid;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.EloRating.eloRating.gameType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field4() {
+		return mineplex.database.tables.EloRating.eloRating.elo;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getUuid();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getGameType();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value4() {
+		return getElo();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value2(java.lang.String value) {
+		setUuid(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value3(java.lang.String value) {
+		setGameType(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord value4(java.lang.Integer value) {
+		setElo(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public EloRatingRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached EloRatingRecord
+	 */
+	public EloRatingRecord() {
+		super(mineplex.database.tables.EloRating.eloRating);
+	}
+
+	/**
+	 * Create a detached, initialised EloRatingRecord
+	 */
+	public EloRatingRecord(java.lang.Integer id, java.lang.String uuid, java.lang.String gameType, java.lang.Integer elo) {
+		super(mineplex.database.tables.EloRating.eloRating);
+
+		setValue(0, id);
+		setValue(1, uuid);
+		setValue(2, gameType);
+		setValue(3, elo);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/FieldBlockRecord.java

@@ -0,0 +1,474 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldBlockRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.FieldBlockRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Double, java.lang.String> {
+
+	private static final long serialVersionUID = -651776664;
+
+	/**
+	 * Setter for <code>Account.fieldBlock.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.server</code>.
+	 */
+	public void setServer(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.server</code>.
+	 */
+	public java.lang.String getServer() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.location</code>.
+	 */
+	public void setLocation(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.location</code>.
+	 */
+	public java.lang.String getLocation() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.blockId</code>.
+	 */
+	public void setBlockId(java.lang.Integer value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.blockId</code>.
+	 */
+	public java.lang.Integer getBlockId() {
+		return (java.lang.Integer) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.blockData</code>.
+	 */
+	public void setBlockData(java.lang.Byte value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.blockData</code>.
+	 */
+	public java.lang.Byte getBlockData() {
+		return (java.lang.Byte) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.emptyId</code>.
+	 */
+	public void setEmptyId(java.lang.Integer value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.emptyId</code>.
+	 */
+	public java.lang.Integer getEmptyId() {
+		return (java.lang.Integer) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.emptyData</code>.
+	 */
+	public void setEmptyData(java.lang.Byte value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.emptyData</code>.
+	 */
+	public java.lang.Byte getEmptyData() {
+		return (java.lang.Byte) getValue(6);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.stockMax</code>.
+	 */
+	public void setStockMax(java.lang.Integer value) {
+		setValue(7, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.stockMax</code>.
+	 */
+	public java.lang.Integer getStockMax() {
+		return (java.lang.Integer) getValue(7);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.stockRegenTime</code>.
+	 */
+	public void setStockRegenTime(java.lang.Double value) {
+		setValue(8, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.stockRegenTime</code>.
+	 */
+	public java.lang.Double getStockRegenTime() {
+		return (java.lang.Double) getValue(8);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldBlock.loot</code>.
+	 */
+	public void setLoot(java.lang.String value) {
+		setValue(9, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldBlock.loot</code>.
+	 */
+	public java.lang.String getLoot() {
+		return (java.lang.String) getValue(9);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record10 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Double, java.lang.String> fieldsRow() {
+		return (org.jooq.Row10) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Byte, java.lang.Integer, java.lang.Double, java.lang.String> valuesRow() {
+		return (org.jooq.Row10) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.server;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.location;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field4() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.blockId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field5() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.blockData;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field6() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.emptyId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field7() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.emptyData;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field8() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.stockMax;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Double> field9() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.stockRegenTime;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field10() {
+		return mineplex.database.tables.FieldBlock.fieldBlock.loot;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getServer();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getLocation();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value4() {
+		return getBlockId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value5() {
+		return getBlockData();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value6() {
+		return getEmptyId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value7() {
+		return getEmptyData();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value8() {
+		return getStockMax();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Double value9() {
+		return getStockRegenTime();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value10() {
+		return getLoot();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value2(java.lang.String value) {
+		setServer(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value3(java.lang.String value) {
+		setLocation(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value4(java.lang.Integer value) {
+		setBlockId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value5(java.lang.Byte value) {
+		setBlockData(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value6(java.lang.Integer value) {
+		setEmptyId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value7(java.lang.Byte value) {
+		setEmptyData(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value8(java.lang.Integer value) {
+		setStockMax(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value9(java.lang.Double value) {
+		setStockRegenTime(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord value10(java.lang.String value) {
+		setLoot(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldBlockRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4, java.lang.Byte value5, java.lang.Integer value6, java.lang.Byte value7, java.lang.Integer value8, java.lang.Double value9, java.lang.String value10) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached FieldBlockRecord
+	 */
+	public FieldBlockRecord() {
+		super(mineplex.database.tables.FieldBlock.fieldBlock);
+	}
+
+	/**
+	 * Create a detached, initialised FieldBlockRecord
+	 */
+	public FieldBlockRecord(java.lang.Integer id, java.lang.String server, java.lang.String location, java.lang.Integer blockId, java.lang.Byte blockData, java.lang.Integer emptyId, java.lang.Byte emptyData, java.lang.Integer stockMax, java.lang.Double stockRegenTime, java.lang.String loot) {
+		super(mineplex.database.tables.FieldBlock.fieldBlock);
+
+		setValue(0, id);
+		setValue(1, server);
+		setValue(2, location);
+		setValue(3, blockId);
+		setValue(4, blockData);
+		setValue(5, emptyId);
+		setValue(6, emptyData);
+		setValue(7, stockMax);
+		setValue(8, stockRegenTime);
+		setValue(9, loot);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/FieldMonsterRecord.java

@@ -0,0 +1,434 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldMonsterRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.FieldMonsterRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.String, java.lang.Integer, java.lang.Integer> {
+
+	private static final long serialVersionUID = 1066502903;
+
+	/**
+	 * Setter for <code>Account.fieldMonster.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.server</code>.
+	 */
+	public void setServer(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.server</code>.
+	 */
+	public java.lang.String getServer() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.name</code>.
+	 */
+	public void setName(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.name</code>.
+	 */
+	public java.lang.String getName() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.type</code>.
+	 */
+	public void setType(java.lang.String value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.type</code>.
+	 */
+	public java.lang.String getType() {
+		return (java.lang.String) getValue(3);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.mobMax</code>.
+	 */
+	public void setMobMax(java.lang.Integer value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.mobMax</code>.
+	 */
+	public java.lang.Integer getMobMax() {
+		return (java.lang.Integer) getValue(4);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.mobRate</code>.
+	 */
+	public void setMobRate(java.lang.Double value) {
+		setValue(5, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.mobRate</code>.
+	 */
+	public java.lang.Double getMobRate() {
+		return (java.lang.Double) getValue(5);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.center</code>.
+	 */
+	public void setCenter(java.lang.String value) {
+		setValue(6, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.center</code>.
+	 */
+	public java.lang.String getCenter() {
+		return (java.lang.String) getValue(6);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.radius</code>.
+	 */
+	public void setRadius(java.lang.Integer value) {
+		setValue(7, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.radius</code>.
+	 */
+	public java.lang.Integer getRadius() {
+		return (java.lang.Integer) getValue(7);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldMonster.height</code>.
+	 */
+	public void setHeight(java.lang.Integer value) {
+		setValue(8, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldMonster.height</code>.
+	 */
+	public java.lang.Integer getHeight() {
+		return (java.lang.Integer) getValue(8);
+	}
+
+	// -------------------------------------------------------------------------
+	// Primary key information
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Record1<java.lang.Integer> key() {
+		return (org.jooq.Record1) super.key();
+	}
+
+	// -------------------------------------------------------------------------
+	// Record9 type implementation
+	// -------------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row9<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.String, java.lang.Integer, java.lang.Integer> fieldsRow() {
+		return (org.jooq.Row9) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row9<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.String, java.lang.Integer, java.lang.Integer> valuesRow() {
+		return (org.jooq.Row9) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.server;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field4() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.type;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field5() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.mobMax;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Double> field6() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.mobRate;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field7() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.center;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field8() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.radius;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field9() {
+		return mineplex.database.tables.FieldMonster.fieldMonster.height;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getServer();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value4() {
+		return getType();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value5() {
+		return getMobMax();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Double value6() {
+		return getMobRate();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value7() {
+		return getCenter();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value8() {
+		return getRadius();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value9() {
+		return getHeight();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value2(java.lang.String value) {
+		setServer(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value3(java.lang.String value) {
+		setName(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value4(java.lang.String value) {
+		setType(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value5(java.lang.Integer value) {
+		setMobMax(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value6(java.lang.Double value) {
+		setMobRate(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value7(java.lang.String value) {
+		setCenter(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value8(java.lang.Integer value) {
+		setRadius(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord value9(java.lang.Integer value) {
+		setHeight(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldMonsterRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.Integer value5, java.lang.Double value6, java.lang.String value7, java.lang.Integer value8, java.lang.Integer value9) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached FieldMonsterRecord
+	 */
+	public FieldMonsterRecord() {
+		super(mineplex.database.tables.FieldMonster.fieldMonster);
+	}
+
+	/**
+	 * Create a detached, initialised FieldMonsterRecord
+	 */
+	public FieldMonsterRecord(java.lang.Integer id, java.lang.String server, java.lang.String name, java.lang.String type, java.lang.Integer mobMax, java.lang.Double mobRate, java.lang.String center, java.lang.Integer radius, java.lang.Integer height) {
+		super(mineplex.database.tables.FieldMonster.fieldMonster);
+
+		setValue(0, id);
+		setValue(1, server);
+		setValue(2, name);
+		setValue(3, type);
+		setValue(4, mobMax);
+		setValue(5, mobRate);
+		setValue(6, center);
+		setValue(7, radius);
+		setValue(8, height);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/FieldOreRecord.java

@@ -0,0 +1,194 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class FieldOreRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.FieldOreRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.String, java.lang.String> {
+
+	private static final long serialVersionUID = 1701809709;
+
+	/**
+	 * Setter for <code>Account.fieldOre.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldOre.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldOre.server</code>.
+	 */
+	public void setServer(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldOre.server</code>.
+	 */
+	public java.lang.String getServer() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.fieldOre.location</code>.
+	 */
+	public void setLocation(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.fieldOre.location</code>.
+	 */
+	public java.lang.String getLocation() {
+		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.String, java.lang.String> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.String, java.lang.String> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.FieldOre.fieldOre.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.FieldOre.fieldOre.server;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.FieldOre.fieldOre.location;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getServer();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getLocation();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldOreRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldOreRecord value2(java.lang.String value) {
+		setServer(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldOreRecord value3(java.lang.String value) {
+		setLocation(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public FieldOreRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached FieldOreRecord
+	 */
+	public FieldOreRecord() {
+		super(mineplex.database.tables.FieldOre.fieldOre);
+	}
+
+	/**
+	 * Create a detached, initialised FieldOreRecord
+	 */
+	public FieldOreRecord(java.lang.Integer id, java.lang.String server, java.lang.String location) {
+		super(mineplex.database.tables.FieldOre.fieldOre);
+
+		setValue(0, id);
+		setValue(1, server);
+		setValue(2, location);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/RewardLogRecord.java

@@ -1,314 +0,0 @@
-/**
- * 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", "3.4.2" },
-                            comments = "This class is generated by jOOQ")
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class RewardLogRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.RewardLogRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record6<java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> {
-
-	private static final long serialVersionUID = 2005336153;
-
-	/**
-	 * Setter for <code>Account.rewardLog.id</code>.
-	 */
-	public void setId(java.lang.Integer value) {
-		setValue(0, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.id</code>.
-	 */
-	public java.lang.Integer getId() {
-		return (java.lang.Integer) getValue(0);
-	}
-
-	/**
-	 * Setter for <code>Account.rewardLog.accountId</code>.
-	 */
-	public void setAccountId(java.lang.Integer value) {
-		setValue(1, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.accountId</code>.
-	 */
-	public java.lang.Integer getAccountId() {
-		return (java.lang.Integer) getValue(1);
-	}
-
-	/**
-	 * Setter for <code>Account.rewardLog.date</code>.
-	 */
-	public void setDate(java.sql.Timestamp value) {
-		setValue(2, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.date</code>.
-	 */
-	public java.sql.Timestamp getDate() {
-		return (java.sql.Timestamp) getValue(2);
-	}
-
-	/**
-	 * Setter for <code>Account.rewardLog.type</code>.
-	 */
-	public void setType(java.lang.String value) {
-		setValue(3, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.type</code>.
-	 */
-	public java.lang.String getType() {
-		return (java.lang.String) getValue(3);
-	}
-
-	/**
-	 * Setter for <code>Account.rewardLog.rarity</code>.
-	 */
-	public void setRarity(java.lang.String value) {
-		setValue(4, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.rarity</code>.
-	 */
-	public java.lang.String getRarity() {
-		return (java.lang.String) getValue(4);
-	}
-
-	/**
-	 * Setter for <code>Account.rewardLog.reward</code>.
-	 */
-	public void setReward(java.lang.String value) {
-		setValue(5, value);
-	}
-
-	/**
-	 * Getter for <code>Account.rewardLog.reward</code>.
-	 */
-	public java.lang.String getReward() {
-		return (java.lang.String) getValue(5);
-	}
-
-	// -------------------------------------------------------------------------
-	// Primary key information
-	// -------------------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Record1<java.lang.Integer> key() {
-		return (org.jooq.Record1) super.key();
-	}
-
-	// -------------------------------------------------------------------------
-	// Record6 type implementation
-	// -------------------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Row6<java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> fieldsRow() {
-		return (org.jooq.Row6) super.fieldsRow();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Row6<java.lang.Integer, java.lang.Integer, java.sql.Timestamp, java.lang.String, java.lang.String, java.lang.String> valuesRow() {
-		return (org.jooq.Row6) super.valuesRow();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.lang.Integer> field1() {
-		return mineplex.database.tables.RewardLog.rewardLog.id;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.lang.Integer> field2() {
-		return mineplex.database.tables.RewardLog.rewardLog.accountId;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.sql.Timestamp> field3() {
-		return mineplex.database.tables.RewardLog.rewardLog.date;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.lang.String> field4() {
-		return mineplex.database.tables.RewardLog.rewardLog.type;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.lang.String> field5() {
-		return mineplex.database.tables.RewardLog.rewardLog.rarity;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public org.jooq.Field<java.lang.String> field6() {
-		return mineplex.database.tables.RewardLog.rewardLog.reward;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.lang.Integer value1() {
-		return getId();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.lang.Integer value2() {
-		return getAccountId();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.sql.Timestamp value3() {
-		return getDate();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.lang.String value4() {
-		return getType();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.lang.String value5() {
-		return getRarity();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public java.lang.String value6() {
-		return getReward();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value1(java.lang.Integer value) {
-		setId(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value2(java.lang.Integer value) {
-		setAccountId(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value3(java.sql.Timestamp value) {
-		setDate(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value4(java.lang.String value) {
-		setType(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value5(java.lang.String value) {
-		setRarity(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord value6(java.lang.String value) {
-		setReward(value);
-		return this;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RewardLogRecord values(java.lang.Integer value1, java.lang.Integer value2, java.sql.Timestamp value3, java.lang.String value4, java.lang.String value5, java.lang.String value6) {
-		return this;
-	}
-
-	// -------------------------------------------------------------------------
-	// Constructors
-	// -------------------------------------------------------------------------
-
-	/**
-	 * Create a detached RewardLogRecord
-	 */
-	public RewardLogRecord() {
-		super(mineplex.database.tables.RewardLog.rewardLog);
-	}
-
-	/**
-	 * Create a detached, initialised RewardLogRecord
-	 */
-	public RewardLogRecord(java.lang.Integer id, java.lang.Integer accountId, java.sql.Timestamp date, java.lang.String type, java.lang.String rarity, java.lang.String reward) {
-		super(mineplex.database.tables.RewardLog.rewardLog);
-
-		setValue(0, id);
-		setValue(1, accountId);
-		setValue(2, date);
-		setValue(3, type);
-		setValue(4, rarity);
-		setValue(5, reward);
-	}
-}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/SpawnsRecord.java

@@ -0,0 +1,194 @@
+/**
+ * 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", "3.4.2" },
+                            comments = "This class is generated by jOOQ")
+@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class SpawnsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.SpawnsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.String, java.lang.String> {
+
+	private static final long serialVersionUID = 507006084;
+
+	/**
+	 * Setter for <code>Account.spawns.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.spawns.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.spawns.serverName</code>.
+	 */
+	public void setServerName(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.spawns.serverName</code>.
+	 */
+	public java.lang.String getServerName() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.spawns.location</code>.
+	 */
+	public void setLocation(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.spawns.location</code>.
+	 */
+	public java.lang.String getLocation() {
+		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.String, java.lang.String> fieldsRow() {
+		return (org.jooq.Row3) super.fieldsRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Row3<java.lang.Integer, java.lang.String, java.lang.String> valuesRow() {
+		return (org.jooq.Row3) super.valuesRow();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field1() {
+		return mineplex.database.tables.Spawns.spawns.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.Spawns.spawns.serverName;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.Spawns.spawns.location;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getServerName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getLocation();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SpawnsRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SpawnsRecord value2(java.lang.String value) {
+		setServerName(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SpawnsRecord value3(java.lang.String value) {
+		setLocation(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SpawnsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached SpawnsRecord
+	 */
+	public SpawnsRecord() {
+		super(mineplex.database.tables.Spawns.spawns);
+	}
+
+	/**
+	 * Create a detached, initialised SpawnsRecord
+	 */
+	public SpawnsRecord(java.lang.Integer id, java.lang.String serverName, java.lang.String location) {
+		super(mineplex.database.tables.Spawns.spawns);
+
+		setValue(0, id);
+		setValue(1, serverName);
+		setValue(2, location);
+	}
+}

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

@@ -64,8 +64,8 @@ public class TextManager extends MiniPlugin
 		UtilBlockText.MakeText("TEAM DEATHMATCH", locComp.clone().add(15, 21, 0), faceComp, 159, (byte)1, TextAlign.CENTER);
 		UtilBlockText.MakeText("TEAM DEATHMATCH", locComp.clone().add(16, 21, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
 		
-		//UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(15, 28, 0), faceComp, 159, (byte)14, TextAlign.CENTER);
+		UtilBlockText.MakeText("CLANS", locComp.clone().add(15, 28, 0), faceComp, 159, (byte)14, TextAlign.CENTER);
-		//UtilText.MakeText("CAPTURE THE PIG", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
+		UtilBlockText.MakeText("CLANS", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
 		
 		//Arcade
 		UtilBlockText.MakeText("ARCADE", locArcade, faceArcade, 159, (byte)5, TextAlign.CENTER);

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java

@@ -754,4 +754,22 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
 			for (Player player : skill.GetUsers())
 				skill.Reset(player);
 	}
+	
+	@Override
+	public void RegisterSelf()
+	{
+		RegisterEvents(this);
+		
+		for (Skill skill : _skillMap.values())
+			RegisterEvents(skill);
+	}
+	
+	@Override
+	public void DeregisterSelf()
+	{
+		HandlerList.unregisterAll(this);
+		
+		for (Skill skill : _skillMap.values())
+			HandlerList.unregisterAll(skill);
+	}
 }

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java

@@ -12,12 +12,14 @@ import mineplex.core.energy.Energy;
 import mineplex.minecraft.game.core.fire.Fire;
 import mineplex.core.projectile.ProjectileManager;
 import mineplex.minecraft.game.classcombat.Class.ClassManager;
+import mineplex.minecraft.game.classcombat.Skill.Skill;
 import mineplex.minecraft.game.classcombat.item.Consume.*;
 import mineplex.minecraft.game.classcombat.item.Throwable.*;
 import mineplex.minecraft.game.classcombat.item.weapon.*;
 import mineplex.minecraft.game.core.damage.DamageManager;
 
 import org.bukkit.Material;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class ItemFactory extends MiniPlugin implements IItemFactory
@@ -232,4 +234,22 @@ public class ItemFactory extends MiniPlugin implements IItemFactory
 	{
 		return _projectileManager;
 	}
+	
+	@Override
+	public void RegisterSelf()
+	{
+		RegisterEvents(this);
+		
+		for (Item item : _items.values())
+			RegisterEvents(item);
+	}
+	
+	@Override
+	public void DeregisterSelf()
+	{
+		HandlerList.unregisterAll(this);
+		
+		for (Item item : _items.values())
+			HandlerList.unregisterAll(item);
+	}
 }

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java

@@ -29,12 +29,20 @@ import mineplex.core.common.util.UtilEvent;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
+import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.minecraft.game.core.combat.event.ClearCombatEvent;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 
 public class CombatManager extends MiniPlugin
 {
+	public enum AttackReason
+	{
+		Attack,
+		CustomWeaponName,
+		DefaultWeaponName
+	}
+	
 	private NautHashMap<Player, CombatLog> _active = new NautHashMap<Player, CombatLog>();
 	private NautHashMap<String, ClientCombat> _combatClients = new NautHashMap<String, ClientCombat>();
 
@@ -42,6 +50,8 @@ public class CombatManager extends MiniPlugin
 
 	protected long ExpireTime = 15000;
 	
+	protected AttackReason _attackReason = AttackReason.CustomWeaponName;
+
 	public CombatManager(JavaPlugin plugin)
 	{
 		super("Combat", plugin);
@@ -203,6 +213,24 @@ public class CombatManager extends MiniPlugin
 				{
 					Player damager = event.GetDamagerPlayer(false);
 
+					
+					reason = "Attack";
+					
+					if (_attackReason == AttackReason.DefaultWeaponName)
+					{
+						reason = "Fists";
+						
+						if (damager.getItemInHand() != null)
+						{
+							byte data = 0;
+							if (damager.getItemInHand().getData() != null)
+								data = damager.getItemInHand().getData().getData();
+							
+							reason = ItemStackFactory.Instance.GetName(damager.getItemInHand().getType(), data, false);
+						}
+					}
+					else if (_attackReason == AttackReason.CustomWeaponName)
+					{
 						reason = "Fists";
 
 						if (damager.getItemInHand() != null)
@@ -216,7 +244,9 @@ public class CombatManager extends MiniPlugin
 										damager.getItemInHand()).getName();
 							}
 						}
-				} else if (event.GetProjectile() != null)
+					}
+				} 
+				else if (event.GetProjectile() != null)
 				{
 					if (event.GetProjectile() instanceof Arrow)
 						reason = "Archery";
@@ -582,4 +612,14 @@ public class CombatManager extends MiniPlugin
 
 		player.sendMessage(F.main(getName(), nameBuilder.toString()));
 	}
+	
+	public void setUseWeaponName(AttackReason var)
+	{
+		_attackReason = var;
+	}
+	
+	public AttackReason getUseWeapoName()
+	{
+		return _attackReason;
+	}
 }

Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java

@@ -9,11 +9,12 @@ import org.bukkit.ChatColor;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 
-public class CustomDamageEvent extends Event 
+public class CustomDamageEvent extends Event implements Cancellable
 {
 	private static final HandlerList handlers = new HandlerList();
 
@@ -269,4 +270,22 @@ public class CustomDamageEvent extends Event
 	{
 		return _damageToLevel;
 	}
+
+    @Override
+    public boolean isCancelled()
+    {
+        return IsCancelled();
+    }
+
+    @Override
+    @Deprecated
+    /**
+     * Don't call this method. Use SetCancelled(String) instead.
+     * 
+     * You will be made the butt of jokes if you use this method.
+     */
+    public void setCancelled(boolean isCancelled)
+    {
+        SetCancelled("No reason given because SOMEONE IS AN IDIOT");
+    }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java

@@ -20,6 +20,7 @@ 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.BlockBurnEvent;
 import org.bukkit.event.block.BlockFadeEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
@@ -124,12 +125,25 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 	private Creature _creature;
 	private DamageManager _damageManager;
 	private Explosion _explosionManager;
+	
 	private Fire _fire;
 	private ProjectileManager _projectileManager;
 	
+	
+
 	private Portal _portal;
 	private ArcadeShop _arcadeShop;
 	
+	//Champions Modules
+	private boolean _enabled = true;
+	private ClassManager _classManager;
+	private SkillFactory _skillFactory;
+	private ItemFactory _itemFactory;
+	private Energy _energy;
+	private ClassShopManager _classShopManager;
+	private ClassCombatShop _classShop;
+	private EloManager _eloManager;
+	
 	// Managers 
 	private GameFactory _gameFactory;
 	private GameCreationManager _gameCreationManager;
@@ -147,15 +161,12 @@ public class ArcadeManager extends MiniPlugin implements IRelation
     private HologramManager _hologramManager;
 	private AchievementManager _achievementManager;
 	private StatsManager _statsManager;
-	private ClassManager _classManager;
+
-	private SkillFactory _skillFactory;
-	private ClassShopManager _classShopManager;
-	private ClassCombatShop _classShop;
 	private TaskManager _taskManager;
 	private ArcadeRepository _arcadeRepository;
     private PacketHandler _packetHandler;
 	
-	private EloManager _eloManager;
+	
 
 	// Observers
 	private HashSet<Player> _specList = new HashSet<Player>();
@@ -258,29 +269,25 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		new SoupAddon(plugin, this);
 		new TeamArmorAddon(plugin, this);
 		
-		if (serverConfig.GameList.contains(GameType.ChampionsDominate)
+		//Champions Modules
-				|| serverConfig.GameList.contains(GameType.ChampionsTDM)
+		_energy = new Energy(plugin);
-				|| serverConfig.GameList.contains(GameType.ChampionsMOBA))
-		{
-			Energy energy = new Energy(plugin);
 		
-			ItemFactory itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, energy,
+		_itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, _energy,
 				_fire, _projectileManager, webAddress);
 		
 		_skillFactory = new SkillFactory(plugin, damageManager, this, _damageManager.GetCombatManager(),
 				_conditionManager, _projectileManager, _disguiseManager, _blockRestore, _fire, new Movement(plugin), teleport,
-					energy, webAddress);
+				_energy, webAddress);
 		
-			_classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, itemFactory,
+		_classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, _itemFactory,
 				webAddress);
 
-			_classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, itemFactory, _achievementManager, clientManager);
+		_classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, _itemFactory, _achievementManager, clientManager);
 		
 		_classShop = new ClassCombatShop(_classShopManager, clientManager, donationManager, false, "Class Shop");
 
 		_eloManager = new EloManager(_plugin, clientManager);
 	}
-	}
 
 	@Override
 	public void AddCommands()
@@ -1118,4 +1125,43 @@ public class ArcadeManager extends MiniPlugin implements IRelation
 		if (reward.canGiveReward(player))
 			reward.giveReward(null, player);
 	}
+	
+	public void toggleChampionsModules(GameType gameType)
+	{
+		boolean isChamps = gameType == GameType.ChampionsDominate || gameType == GameType.ChampionsTDM || gameType == GameType.ChampionsMOBA;
+
+		if (_enabled == isChamps)
+		{
+			System.out.println("----------Champions Modules are still " + isChamps);
+			return;
+		}
+			
+		System.out.println("----------Champions Modules set to " + isChamps);
+		_enabled = isChamps;
+		
+		if (_enabled)
+		{
+			_classManager.RegisterSelf();
+			_classShopManager.RegisterSelf();
+			_skillFactory.RegisterSelf();
+			_itemFactory.RegisterSelf();
+			_energy.RegisterSelf();
+			_eloManager.RegisterSelf();
+			
+			//Class Shop
+			_plugin.getServer().getPluginManager().registerEvents(_classShop, _plugin);
+		}
+		else
+		{
+			_classManager.DeregisterSelf();
+			_classShopManager.DeregisterSelf();
+			_skillFactory.DeregisterSelf();
+			_itemFactory.DeregisterSelf();
+			_energy.DeregisterSelf();
+			_eloManager.DeregisterSelf();
+			
+			//Class Shop
+			HandlerList.unregisterAll(_classShop);
+		}
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java

@@ -5,74 +5,77 @@ import org.bukkit.Material;
 public enum GameType
 {	
 	//Mini
-	BaconBrawl("Bacon Brawl", Material.PORK, (byte)0),
+	BaconBrawl("Bacon Brawl", Material.PORK, (byte)0, GameCategory.ARCADE),
-	Barbarians("A Barbarians Life", Material.WOOD_AXE, (byte)0),
+	Barbarians("A Barbarians Life", Material.WOOD_AXE, (byte)0, GameCategory.ARCADE),
-	Bridge("The Bridges", Material.IRON_PICKAXE, (byte)0),
+	Bridge("The Bridges", Material.IRON_PICKAXE, (byte)0, GameCategory.SURVIVAL),
-	CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0),
+	CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.CLASSICS),
-	ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0),
+	ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0, GameCategory.CHAMPIONS),
-	ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0),
+	ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0, GameCategory.CHAMPIONS),
-	ChampionsMOBA("Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0),
+	ChampionsMOBA("Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0, GameCategory.CHAMPIONS),
-	Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0),
+	Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0, GameCategory.CLASSICS),
-	DeathTag("Death Tag", Material.SKULL_ITEM, (byte)0),
+	DeathTag("Death Tag", Material.SKULL_ITEM, (byte)0, GameCategory.ARCADE),
-	DragonEscape("Dragon Escape", Material.DRAGON_EGG, (byte)0),
+	DragonEscape("Dragon Escape", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE),
-	DragonEscapeTeams("Dragon Escape Teams", Material.DRAGON_EGG, (byte)0),
+	DragonEscapeTeams("Dragon Escape Teams", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE),
-	DragonRiders("Dragon Riders", Material.DRAGON_EGG, (byte)0),
+	DragonRiders("Dragon Riders", Material.DRAGON_EGG, (byte)0, GameCategory.ARCADE),
-	Dragons("Dragons", Material.ENDER_STONE, (byte)0),
+	Dragons("Dragons", Material.ENDER_STONE, (byte)0, GameCategory.ARCADE),
-	DragonsTeams("Dragons Teams", Material.ENDER_STONE, (byte)0),
+	DragonsTeams("Dragons Teams", Material.ENDER_STONE, (byte)0, GameCategory.ARCADE),
-	Draw("Draw My Thing", Material.BOOK_AND_QUILL, (byte)0),
+	Draw("Draw My Thing", Material.BOOK_AND_QUILL, (byte)0, GameCategory.CLASSICS),
-	Evolution("Evolution", Material.EMERALD, (byte)0),
+	Evolution("Evolution", Material.EMERALD, (byte)0, GameCategory.ARCADE),
-	FlappyBird("Flappy Bird", Material.FEATHER, (byte)0),
+	FlappyBird("Flappy Bird", Material.FEATHER, (byte)0, GameCategory.ARCADE),
-	Gravity("Gravity", Material.ENDER_PORTAL, (byte)0),
+	Gravity("Gravity", Material.ENDER_PORTAL, (byte)0, GameCategory.ARCADE),
-	Halloween("Halloween Horror", Material.PUMPKIN, (byte)0),
+	Halloween("Halloween Horror", Material.PUMPKIN, (byte)0, GameCategory.CLASSICS),
-	HideSeek("Block Hunt", Material.GRASS, (byte)0),
+	HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS),
-	Horse("Horseback", Material.IRON_BARDING, (byte)0),
+	Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE),
-	SurvivalGames("Survival Games", Material.IRON_SWORD, (byte)0),
+	SurvivalGames("Survival Games", Material.IRON_SWORD, (byte)0, GameCategory.SURVIVAL),
-	SurvivalGamesTeams("Survival Games Teams", Material.IRON_SWORD, (byte)0),
+	SurvivalGamesTeams("Survival Games Teams", Material.IRON_SWORD, (byte)0, GameCategory.SURVIVAL),
-	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0),
+	Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE),
-	MineStrike("MineStrike", Material.TNT, (byte)0),
+	MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CLASSICS),
-	MineWare("MineWare", Material.PAPER, (byte)0),
+	MineWare("MineWare", Material.PAPER, (byte)0, GameCategory.ARCADE),
-	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0),
+	MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE),
-	Paintball("Super Paintball", Material.ENDER_PEARL, (byte)0),
+	Paintball("Super Paintball", Material.ENDER_PEARL, (byte)0, GameCategory.ARCADE),
-	Quiver("One in the Quiver", Material.ARROW, (byte)0),
+	Quiver("One in the Quiver", Material.ARROW, (byte)0, GameCategory.ARCADE),
-	QuiverTeams("One in the Quiver Teams", Material.ARROW, (byte)0),
+	QuiverTeams("One in the Quiver Teams", Material.ARROW, (byte)0, GameCategory.ARCADE),
-	Runner("Runner", Material.LEATHER_BOOTS, (byte)0),
+	Runner("Runner", Material.LEATHER_BOOTS, (byte)0, GameCategory.ARCADE),
-	SearchAndDestroy("Search and Destroy", Material.TNT, (byte)0),
+	SearchAndDestroy("Search and Destroy", Material.TNT, (byte)0, GameCategory.SURVIVAL),
-	Sheep("Sheep Quest", Material.WOOL, (byte)4),
+	Sheep("Sheep Quest", Material.WOOL, (byte)4, GameCategory.ARCADE),
-	Smash("Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
+	Smash("Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS),
-	SmashTeams("Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
+	SmashTeams("Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS),
-	SmashDomination("Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
+	SmashDomination("Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS),
-	Snake("Snake", Material.WOOL, (byte)0),
+	Snake("Snake", Material.WOOL, (byte)0, GameCategory.ARCADE),
-	SneakyAssassins("Sneaky Assassins", Material.INK_SACK, (byte)0),
+	SneakyAssassins("Sneaky Assassins", Material.INK_SACK, (byte)0, GameCategory.ARCADE),
-	SnowFight("Snow Fight", Material.SNOW_BALL, (byte)0),
+	SnowFight("Snow Fight", Material.SNOW_BALL, (byte)0, GameCategory.ARCADE),
-	Spleef("Super Spleef", Material.IRON_SPADE, (byte)0),
+	Spleef("Super Spleef", Material.IRON_SPADE, (byte)0, GameCategory.ARCADE),
-	SpleefTeams("Super Spleef Teams", Material.IRON_SPADE, (byte)0),
+	SpleefTeams("Super Spleef Teams", Material.IRON_SPADE, (byte)0, GameCategory.ARCADE),
-	Stacker("Super Stacker", Material.BOWL, (byte)0),
+	Stacker("Super Stacker", Material.BOWL, (byte)0, GameCategory.ARCADE),
-	SquidShooter("Squid Shooter", Material.FIREWORK_CHARGE, (byte)0),
+	SquidShooter("Squid Shooter", Material.FIREWORK_CHARGE, (byte)0, GameCategory.ARCADE),
-	Tug("Tug of Wool", Material.WHEAT, (byte)0),
+	Tug("Tug of Wool", Material.WHEAT, (byte)0, GameCategory.ARCADE),
-	TurfWars("Turf Wars", Material.STAINED_CLAY, (byte)14),
+	TurfWars("Turf Wars", Material.STAINED_CLAY, (byte)14, GameCategory.ARCADE),
-	UHC("Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0),
+	UHC("Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0, GameCategory.SURVIVAL),
-	WitherAssault("Wither Assault", Material.SKULL_ITEM, (byte)1),
+	WitherAssault("Wither Assault", Material.SKULL_ITEM, (byte)1, GameCategory.ARCADE),
-	ZombieSurvival("Zombie Survival", Material.SKULL_ITEM, (byte)2);
+	ZombieSurvival("Zombie Survival", Material.SKULL_ITEM, (byte)2, GameCategory.SURVIVAL);
 	
 	String _name;
 	String _lobbyName;
 	Material _mat; 
 	byte _data;
+	GameCategory _gameCategory;
 
-	GameType(String name, Material mat, byte data)
+	GameType(String name, Material mat, byte data, GameCategory gameCategory)
 	{
 		_name = name;
 		_lobbyName = name;
 		_mat = mat;
 		_data = data;
+		_gameCategory = gameCategory;
 	}
 	
-	GameType(String name, String lobbyName, Material mat, byte data)
+	GameType(String name, String lobbyName, Material mat, byte data, GameCategory gameCategory)
 	{
 		_name = name;
 		_lobbyName = lobbyName;
 		_mat = mat;
 		_data = data;
+		_gameCategory = gameCategory;
 	}
 
 	public String GetName()
@@ -94,4 +97,14 @@ public enum GameType
 	{
 		return _data;
 	}
+
+	public GameCategory getGameCategory()
+	{
+		return _gameCategory;
+	}
+
+	public static enum GameCategory
+	{
+		SURVIVAL, CLASSICS, CHAMPIONS, ARCADE;
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java

@@ -1344,4 +1344,25 @@ public abstract class Game implements Listener
 				Announce(C.cAqua + C.Bold + caller.getName() + " set next game to " + gameType.GetName() + ".");
 		}
 	}
+	
+	public void endGame(GameTeam winningTeam) 
+	{
+	    AnnounceEnd(winningTeam);
+
+        for (GameTeam team : GetTeamList())
+        {
+            if (WinnerTeam != null && team.equals(WinnerTeam))
+            {
+                for (Player player : team.GetPlayers(false))
+                    AddGems(player, 10, "Winning Team", false, false);
+            }
+
+            for (Player player : team.GetPlayers(false))
+                if (player.isOnline())
+                    AddGems(player, 10, "Participation", false, false);
+        }
+
+        //End
+        SetState(GameState.End);
+	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/EvolveButton.java

@@ -9,12 +9,12 @@ import org.bukkit.event.inventory.ClickType;
 
 public class EvolveButton implements IButton
 {
-    private SearchAndDestroy _arcadeManager;
+    private SearchAndDestroy _search;
     private Kit _kit;
 
     public EvolveButton(SearchAndDestroy arcadeManager, Kit kit)
     {
-        _arcadeManager = arcadeManager;
+        _search = arcadeManager;
         _kit = kit;
     }
 
@@ -25,7 +25,8 @@ public class EvolveButton implements IButton
         if (((CraftPlayer) player).getHandle().spectating)
             return;
 
-        _arcadeManager.SetKit(player, _kit, true);
+        _search.SetKit(player, _kit, true);
+        _search.onEvolve(player);
         player.closeInventory();
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/KitEvolve.java

@@ -6,8 +6,11 @@ import mineplex.core.MiniPlugin;
 import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.game.games.searchanddestroy.KitManager.UpgradeKit;
 
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class KitEvolve extends MiniPlugin
@@ -22,16 +25,20 @@ public class KitEvolve extends MiniPlugin
         _arcadeManager = manager;
         _kitEvolve = new KitEvolveShop(this, manager, manager.getArcadeManager().GetClients(), manager.getArcadeManager()
                 .GetDonation(), kits);
-        // TODO Auto-generated constructor stub
     }
 
     @EventHandler
-    public void onInteract(PlayerChatEvent event)
+    public void onInteract(PlayerInteractEvent event)
     {
-        if (_arcadeManager.GetState() == GameState.Live)
+        if (_arcadeManager.GetState() == GameState.Live && event.getAction().name().contains("RIGHT"))
+        {
+            ItemStack item = event.getItem();
+            if (item != null && item.getType() == Material.LEATHER_CHESTPLATE && item.hasItemMeta()
+                    && item.getItemMeta().hasDisplayName())
             {
                 _kitEvolve.attemptShopOpen(event.getPlayer());
             }
         }
+    }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/KitEvolvePage.java

@@ -23,7 +23,7 @@ public class KitEvolvePage extends ShopPageBase<KitEvolve, KitEvolveShop>
     public KitEvolvePage(KitEvolve plugin, SearchAndDestroy arcadeManager, KitEvolveShop shop, CoreClientManager clientManager,
             DonationManager donationManager, Player player, ArrayList<UpgradeKit> kits)
     {
-        super(plugin, shop, clientManager, donationManager, "Kit Evolve Menu", player);
+        super(plugin, shop, clientManager, donationManager, "Kit Evolution", player);
         _search = arcadeManager;
         _kits = kits;
         BuildPage();
@@ -42,7 +42,7 @@ public class KitEvolvePage extends ShopPageBase<KitEvolve, KitEvolveShop>
                 break;
             }
         }
-        boolean canEvolve = true;
+        boolean canEvolve = _search.canEvolve(Player);
         AddItem(kit.kitSlot, makeItem(kit.kit));
         for (int slot : kit.path)
         {
@@ -71,13 +71,25 @@ public class KitEvolvePage extends ShopPageBase<KitEvolve, KitEvolveShop>
         }
         for (UpgradeKit k : _kits)
         {
-            if (getItem(k.kitSlot) == null)
+            ItemStack item = getItem(k.kitSlot);
+            if (item == null || item.getType() == Material.AIR)
             {
-                AddItem(k.kitSlot, makeItem(new ItemBuilder(Material.STONE).setTitle(C.cRed + "Locked").build()));
+                AddItem(k.kitSlot, makeItem(new ItemBuilder(Material.COAL).setTitle(C.cRed + "Locked").build()));
+            }
+        }
+        for (int slot = 0; slot < this.getSize(); slot++)
+        {
+            ItemStack item = getItem(slot);
+            if (item == null || item.getType() == Material.AIR)
+            {
+                AddItem(slot, makeItem(new ItemBuilder(Material.STAINED_GLASS_PANE, 1, (short) 12).setTitle(" ").build()));
             }
         }
     }
 
+    /**
+     * Why do I need to call this and additem again?
+     */
     private ShopItem makeItem(ItemStack item)
     {
         return new ShopItem(item, "", "", 1, false, false);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/KitManager.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.searchanddestroy.kits.bow.*;
+import nautilus.game.arcade.game.games.searchanddestroy.kits.rogue.*;
 import nautilus.game.arcade.game.games.searchanddestroy.kits.trooper.*;
 import nautilus.game.arcade.kit.Kit;
 
@@ -33,33 +34,6 @@ public class KitManager
     public KitManager(SearchAndDestroy search)
     {
         ArcadeManager man = search.getArcadeManager();
-        { // Register bow kits
-            ArrayList<UpgradeKit> children1 = new ArrayList<UpgradeKit>();
-            ArrayList<UpgradeKit> children2 = new ArrayList<UpgradeKit>();
-            ArrayList<UpgradeKit> children3 = new ArrayList<UpgradeKit>();
-
-            UpgradeKit bow1 = new UpgradeKit(null, new KitBow(man), children1, 4);
-            _kits.add(bow1);
-            UpgradeKit bow2 = new UpgradeKit(bow1, new KitQuickshooter(man), children2, 20, 12);
-            _kits.add(bow2);
-            UpgradeKit bow3 = new UpgradeKit(bow1, new KitPunch(man), children3, 24, 14);
-            _kits.add(bow3);
-            UpgradeKit bow4 = new UpgradeKit(bow2, new KitSniper(man), new ArrayList<UpgradeKit>(), 46, 29, 37);
-            _kits.add(bow4);
-            UpgradeKit bow5 = new UpgradeKit(bow2, new KitSharpshooter(man), new ArrayList<UpgradeKit>(), 48, 29, 39);
-            _kits.add(bow5);
-            UpgradeKit bow6 = new UpgradeKit(bow3, new KitPinner(man), new ArrayList<UpgradeKit>(), 50, 33, 41);
-            _kits.add(bow6);
-            UpgradeKit bow7 = new UpgradeKit(bow3, new KitThunderstorm(man), new ArrayList<UpgradeKit>(), 52, 33, 43);
-            _kits.add(bow7);
-            children1.add(bow2);
-            children1.add(bow3);
-            children2.add(bow4);
-            children2.add(bow5);
-            children3.add(bow6);
-            children3.add(bow7);
-
-        }
 
         { // Register sword kits
             ArrayList<UpgradeKit> children1 = new ArrayList<UpgradeKit>();
@@ -68,17 +42,17 @@ public class KitManager
 
             UpgradeKit sword1 = new UpgradeKit(null, new KitTrooper(man), children1, 4);
             _kits.add(sword1);
-            UpgradeKit sword2 = new UpgradeKit(sword1, new KitTrooper(man), children2, 20, 12);
+            UpgradeKit sword2 = new UpgradeKit(sword1, new KitTank(man), children2, 20, 12);
             _kits.add(sword2);
-            UpgradeKit sword3 = new UpgradeKit(sword1, new KitTrooper(man), children3, 24, 14);
+            UpgradeKit sword3 = new UpgradeKit(sword1, new KitAssault(man), children3, 24, 14);
             _kits.add(sword3);
-            UpgradeKit sword4 = new UpgradeKit(sword2, new KitTrooper(man), new ArrayList<UpgradeKit>(), 46, 29, 37);
+            UpgradeKit sword4 = new UpgradeKit(sword2, new KitJuggernaut(man), new ArrayList<UpgradeKit>(), 46, 29, 37);
             _kits.add(sword4);
-            UpgradeKit sword5 = new UpgradeKit(sword2, new KitTrooper(man), new ArrayList<UpgradeKit>(), 48, 29, 39);
+            UpgradeKit sword5 = new UpgradeKit(sword2, new KitTitan(man), new ArrayList<UpgradeKit>(), 48, 29, 39);
             _kits.add(sword5);
-            UpgradeKit sword6 = new UpgradeKit(sword3, new KitTrooper(man), new ArrayList<UpgradeKit>(), 50, 33, 41);
+            UpgradeKit sword6 = new UpgradeKit(sword3, new KitChampion(man), new ArrayList<UpgradeKit>(), 50, 33, 41);
             _kits.add(sword6);
-            UpgradeKit sword7 = new UpgradeKit(sword3, new KitTrooper(man), new ArrayList<UpgradeKit>(), 52, 33, 43);
+            UpgradeKit sword7 = new UpgradeKit(sword3, new KitBeserker(man), new ArrayList<UpgradeKit>(), 52, 33, 43);
             _kits.add(sword7);
             children1.add(sword2);
             children1.add(sword3);
@@ -89,6 +63,63 @@ public class KitManager
 
         }
 
+        { // Register bow kits
+            ArrayList<UpgradeKit> children1 = new ArrayList<UpgradeKit>();
+            ArrayList<UpgradeKit> children2 = new ArrayList<UpgradeKit>();
+            ArrayList<UpgradeKit> children3 = new ArrayList<UpgradeKit>();
+
+            UpgradeKit bowKit = new UpgradeKit(null, new KitBow(man), children1, 4);
+            _kits.add(bowKit);
+            UpgradeKit quickShooter = new UpgradeKit(bowKit, new KitQuickshooter(man), children2, 20, 12);
+            _kits.add(quickShooter);
+            UpgradeKit bow3 = new UpgradeKit(bowKit, new KitPunch(man), children3, 24, 14);
+            _kits.add(bow3);
+            UpgradeKit sniper = new UpgradeKit(quickShooter, new KitSniper(man), new ArrayList<UpgradeKit>(), 46, 29, 37);
+            _kits.add(sniper);
+            UpgradeKit sharpShooter = new UpgradeKit(quickShooter, new KitSharpshooter(man), new ArrayList<UpgradeKit>(), 48, 29,
+                    39);
+            _kits.add(sharpShooter);
+            UpgradeKit pinner = new UpgradeKit(bow3, new KitPinner(man), new ArrayList<UpgradeKit>(), 50, 33, 41);
+            _kits.add(pinner);
+            UpgradeKit thunderstorm = new UpgradeKit(bow3, new KitThunderstorm(man), new ArrayList<UpgradeKit>(), 52, 33, 43);
+            _kits.add(thunderstorm);
+            children1.add(quickShooter);
+            children1.add(bow3);
+            children2.add(sniper);
+            children2.add(sharpShooter);
+            children3.add(pinner);
+            children3.add(thunderstorm);
+
+        }
+
+        /*     { // Register rogue kits
+                 ArrayList<UpgradeKit> children1 = new ArrayList<UpgradeKit>();
+                 ArrayList<UpgradeKit> children2 = new ArrayList<UpgradeKit>();
+                 ArrayList<UpgradeKit> children3 = new ArrayList<UpgradeKit>();
+
+                 UpgradeKit rogue1 = new UpgradeKit(null, new KitRogue(man), children1, 4);
+                 _kits.add(rogue1);
+                 UpgradeKit rogue2 = new UpgradeKit(rogue1, new KitFlash(man), children2, 20, 12);
+                 _kits.add(rogue2);
+                 UpgradeKit rogue3 = new UpgradeKit(rogue1, new KitEvade(man), children3, 24, 14);
+                 _kits.add(rogue3);
+                 UpgradeKit rogue4 = new UpgradeKit(rogue2, new KitMultiFlash(man), new ArrayList<UpgradeKit>(), 46, 29, 37);
+                 _kits.add(rogue4);
+                 UpgradeKit rogue5 = new UpgradeKit(rogue2, new KitPhaseBlast(man), new ArrayList<UpgradeKit>(), 48, 29, 39);
+                 _kits.add(rogue5);
+                 UpgradeKit rogue6 = new UpgradeKit(rogue3, new KitRewind(man), new ArrayList<UpgradeKit>(), 50, 33, 41);
+                 _kits.add(rogue6);
+                 UpgradeKit rogue7 = new UpgradeKit(rogue3, new KitWraith(man), new ArrayList<UpgradeKit>(), 52, 33, 43);
+                 _kits.add(rogue7);
+                 children1.add(rogue2);
+                 children1.add(rogue3);
+                 children2.add(rogue4);
+                 children2.add(rogue5);
+                 children3.add(rogue6);
+                 children3.add(rogue7);
+
+             }*/
+
     }
 
     public Kit[] get_kits()

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/SearchAndDestroy.java

@@ -1,87 +1,53 @@
 package nautilus.game.arcade.game.games.searchanddestroy;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Iterator;
 
 import mineplex.core.common.util.C;
-import mineplex.core.packethandler.IPacketHandler;
+import mineplex.core.common.util.UtilInv;
-import mineplex.core.packethandler.PacketInfo;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.combat.CombatComponent;
+import mineplex.minecraft.game.core.combat.CombatManager.AttackReason;
+import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 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.kit.Kit;
-import net.minecraft.server.v1_7_R4.EntityPlayer;
-import net.minecraft.server.v1_7_R4.EntityTrackerEntry;
-import net.minecraft.server.v1_7_R4.Packet;
-import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy;
-import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.Color;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.scheduler.BukkitRunnable;
 
 public class SearchAndDestroy extends TeamGame
 {
 
     private KitEvolve _evolve;
+    private HashMap<String, Float> _kills = new HashMap<String, Float>();
+    private HashMap<String, Integer> _evolves = new HashMap<String, Integer>();
     private KitManager _kitManager = new KitManager(this);
-    private IPacketHandler _teamBombPackets = new IPacketHandler()
-    {
-
-        @Override
-        public void handle(PacketInfo packetInfo)
-        {
-            try
-            {
-                Packet packet = packetInfo.getPacket();
-                if (packet instanceof PacketPlayOutEntityDestroy)
-                {
-                    Field field = packet.getClass().getDeclaredField("a");
-                    field.setAccessible(true);
-                    int[] ids = (int[]) field.get(packet);
-                    for (TeamBomb bomb : getBombs())
-                    {
-                        int id = bomb.getBomb().getEntityId();
-                        for (int i = 0; i < ids.length; i++)
-                        {
-                            if (id == ids[i])
-                            {
-                                ids[i] = bomb.getFakeBombId();
-                            }
-                        }
-                    }
-                }
-                else if (packet instanceof PacketPlayOutSpawnEntity)
-                {
-
-                }
-
-            }
-            catch (Exception ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    };
     private ArrayList<TeamBomb> _teamBombs = new ArrayList<TeamBomb>();
 
     public SearchAndDestroy(ArcadeManager manager)
@@ -90,7 +56,9 @@ public class SearchAndDestroy extends TeamGame
             {
                     "A test game of", "Search and Destroy"
             });
+
         setKits(_kitManager.get_kits());
+
         _evolve = new KitEvolve(manager.GetPlugin(), this, _kitManager.getUpgradeKits());
         InventoryClick = true;
         WorldTimeSet = -1;
@@ -100,6 +68,9 @@ public class SearchAndDestroy extends TeamGame
         AnnounceJoinQuit = false;
         DisableKillCommand = false;
         AllowParticles = false;
+        DamageSelf = false;
+        
+        Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.DefaultWeaponName);
     }
 
     public ArrayList<TeamBomb> getBombs()
@@ -107,22 +78,61 @@ public class SearchAndDestroy extends TeamGame
         return _teamBombs;
     }
 
+    public boolean canEvolve(Player player)
+    {
+        return true;// (!_evolves.containsKey(player.getName()) || _evolves.get(player.getName()) < 2)
+        // && _kills.containsKey(player.getName()) && _kills.get(player.getName()) >= 2;
+    }
+
+    public void onEvolve(Player player)
+    {
+        final int newTier = (_evolves.containsKey(player.getName()) ? _evolves.get(player.getName()) : 0) + 1;
+
+        player.getWorld().playSound(player.getLocation(), Sound.ZOMBIE_REMEDY, 1.3F, 0);
+        final Location center = player.getLocation();
+        new BukkitRunnable()
+        {
+            double y = 2.2;
+            double rotAngle;
+
+            public void run()
+            {
+                if (y <= 0)
+                {
+                    cancel();
+                }
+                else
+                {
+                    for (int i = 0; i < 8; i++)
+                    {
+                        for (int a = 0; a < 2; a++)
+                        {
+                            double angle = ((2 * Math.PI) / 360D) * ((rotAngle + ((360D / 2) * a)) % 360);
+                            double x = 0.9 * Math.cos(angle);
+                            double z = 0.9 * Math.sin(angle);
+                            Location l = center.clone().add(x, y, z);
+                            l.getWorld().spigot()
+                                    .playEffect(l, newTier == 2 ? Effect.FLAME : Effect.WATERDRIP, 0, 0, 0, 0, 0, 0, 1, 30);
+                        }
+                        y -= 0.008;
+                        rotAngle += 8;
+                    }
+                }
+            }
+        }.runTaskTimer(Manager.GetPlugin(), 0, 0);
+        _evolves.put(player.getName(), newTier);
+        _kills.put(player.getName(), _kills.get(player.getName()) - 2);
+    }
+
     @EventHandler
     public void onBombsPacketListener(GameStateChangeEvent event)
     {
-        if (event.GetState() == GameState.Live)
+        if (event.GetState() == GameState.Prepare)
         {
             for (TeamBomb bomb : getBombs())
             {
                 bomb.setupHologram();
             }
-            // this.getArcadeManager().getPacketHandler().addPacketHandler(_teamBombPackets);
-            // TODO Waiting for client packets to be modifiable
-        }
-        else if (event.GetState() == GameState.End)
-        {
-            // this.getArcadeManager().getPacketHandler().removePacketHandler(_teamBombPackets);
-            // TODO Waiting for client packets to be modifiable
         }
     }
 
@@ -142,10 +152,16 @@ public class SearchAndDestroy extends TeamGame
         }
         if (event.getType() == UpdateType.SEC)
         {
-            Iterator<TeamBomb> itel = getBombs().iterator();
+            boolean teamDied = false;
-            while (itel.hasNext())
+            for (int a = 0; a < getBombs().size(); a++)
             {
-                TeamBomb bomb = itel.next();
+                TeamBomb bomb = getBombs().get(a);
+                if (!bomb.getTeam().IsTeamAlive())
+                {
+                    bomb.removeBomb();
+                    getBombs().remove(a--);
+                    continue;
+                }
                 bomb.checkArmers();
                 bomb.tickBomb();
                 GameTeam bombOwner = bomb.getTeam();
@@ -163,22 +179,30 @@ public class SearchAndDestroy extends TeamGame
                     }
                     else if (timeLeft == 0)
                     {
+                        teamDied = true;
                         // It exploded
-                        itel.remove();
+                        getBombs().remove(a--);
                         bomb.getBlockLocation().getWorld().playSound(bomb.getBlockLocation(), Sound.EXPLODE, 1000, 0);
                         bomb.getBlockLocation().getWorld().playEffect(bomb.getBomb().getLocation(), Effect.EXPLOSION_HUGE, 0);
                         bomb.removeBomb();
+                        DeathMessages = false;
                         for (Player player : this.GetPlayers(true))
                         {
                             GameTeam pTeam = GetTeam(player);
                             if (bombOwner == pTeam)
                             {
                                 Manager.GetDamage().NewDamageEvent(player, null, null, DamageCause.CUSTOM, 999, false, true,
-                                        true, "Bomb", "Bomb Exploded");
+                                        true, "Bomb", "Bomb");
+                                if (IsAlive(player))
+                                {
+                                    this.SetSpectator(player, true);
                                 }
                             }
-                        // TODO The code below may need changing
+                        }
-                        if (getBombs().size() == 1)
+                        DeathMessages = true;
+
+                        // TODO The code below could be used when a team is defeated.
+                        /*       if (getBombs().size() == 1)
                                {
                                    GameTeam winning = getBombs().get(0).getTeam();
                                    Bukkit.broadcastMessage(bombOwner.GetColor() + bombOwner.GetName() + " Team's" + ChatColor.RESET
@@ -188,14 +212,15 @@ public class SearchAndDestroy extends TeamGame
                                else
                                {
                                    Bukkit.broadcastMessage(bombOwner.GetColor() + bombOwner.GetName() + " Team was defeated!");
-                        }
+                               }*/
                     }
                     if (timeLeft > 0)
                     {
-                        int a = timeLeft % 3;
+                        int b = timeLeft % 3;
-                        if (a == 1)
+                        if (b == 1)
                         {
-                            try
+                            bomb.respawnBomb();
+                            /*try
                             {
                                 PacketPlayOutEntityDestroy destroyPacket = new PacketPlayOutEntityDestroy(bomb.getBomb()
                                         .getEntityId());
@@ -224,21 +249,193 @@ public class SearchAndDestroy extends TeamGame
                                                             ex.printStackTrace();
                                                         }
                                                     }
-                                                }, 2);
+                                                }, 4);
                                     }
                                 }
                             }
                             catch (Exception ex)
                             {
                                 ex.printStackTrace();
+                            }*/
+                        }
+                    }
+                }
+            }
+            if (teamDied)
+            {
+                GameTeam aliveTeam = this.getBombs().get(0).getTeam();
+                for (TeamBomb bomb : getBombs())
+                {
+                    if (!bomb.getTeam().equals(aliveTeam))
+                    {
+                        aliveTeam = null;
+                        break;
+                    }
+                }
+                if (aliveTeam != null)
+                {
+                    this.endGame(WinnerTeam);
+                }
+            }
+        }
+    }
+
+    @EventHandler
+    public void onGameState(GameStateChangeEvent event)
+    {
+        if (event.GetState() == GameState.End || event.GetState() == GameState.Live || event.GetState() == GameState.Prepare)
+        {
+            drawScoreboard();
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onDeath(CombatDeathEvent event)
+    {
+        if (GetState() != GameState.Live)
+        {
+            return;
+        }
+
+        if (event.GetLog().GetKiller() == null)
+            return;
+
+        if (!event.GetLog().GetKiller().IsPlayer())
+            return;
+
+        Player player = UtilPlayer.searchExact(event.GetLog().GetKiller().GetName());
+        if (player == null)
+            return;
+        addKill(player, 1);
+        for (CombatComponent log : event.GetLog().GetAttackers())
+        {
+            if (event.GetLog().GetKiller() != null && log.equals(event.GetLog().GetKiller()))
+                continue;
+
+            Player assist = UtilPlayer.searchExact(log.GetName());
+
+            // Assist
+            if (assist != null)
+                addKill(assist, 0.5F);
+        }
+    }
+
+    private void addKill(Player player, float amount)
+    {
+        boolean canEvolve = this.canEvolve(player);
+        this._kills.put(player.getName(), (_kills.containsKey(player.getName()) ? _kills.get(player.getName()) : 0) + 1);
+        if (canEvolve(player) != canEvolve)
+        {
+            UtilTextMiddle.display(ChatColor.GREEN + "Evolution Available", null);
+        }
+    }
+
+    private boolean _flickerOn;
+
+    @EventHandler
+    public void onUpdate(UpdateEvent event)
+    {
+        if (GetState() != GameState.Live || event.getType() != UpdateType.FAST)
+        {
+            return;
+        }
+
+        _flickerOn = !_flickerOn;
+        for (Player player : this.GetPlayers(true))
+        {
+            if (canEvolve(player))
+            {
+                for (int slot = 0; slot < player.getInventory().getSize(); slot++)
+                {
+                    ItemStack item = player.getInventory().getItem(slot);
+                    if (item != null && item.getType() == Material.LEATHER_CHESTPLATE && item.getItemMeta().hasDisplayName()
+                            && item.getItemMeta().getDisplayName().contains("Evolve"))
+                    {
+                        String message = C.Bold + "Evolve Kit!";
+                        if (_flickerOn)
+                        {
+                            UtilInv.addDullEnchantment(item);
+                            message = C.cDGreen + message;
+                        }
+                        else
+                        {
+                            UtilInv.removeDullEnchantment(item);
+                            message = C.cBlue + message;
+                        }
+                        ItemMeta meta = item.getItemMeta();
+                        meta.setDisplayName(message);
+                        ((LeatherArmorMeta) meta).setColor(_flickerOn ? Color.WHITE : GetTeam(player).GetColorBase());
+                        item.setItemMeta(meta);
                     }
                 }
             }
         }
     }
+
+    private void drawScoreboard()
+    {
+        GetScoreboard().Reset();
+
+        GetScoreboard().WriteBlank();
+        ArrayList<GameTeam> aliveTeams = new ArrayList<GameTeam>();
+        for (GameTeam team : GetTeamList())
+        {
+            if (team.IsTeamAlive())
+            {
+                aliveTeams.add(team);
             }
         }
 
+        Iterator<GameTeam> itel = aliveTeams.iterator();
+
+        ArrayList<TeamBomb> bombs = new ArrayList<TeamBomb>(this._teamBombs);
+
+        while (itel.hasNext())
+        {
+            GameTeam team = itel.next();
+            if (!team.IsTeamAlive())
+                continue;
+            GetScoreboard().Write(team.GetColor() + C.Bold + team.GetName() + " Team");
+            GetScoreboard().Write(team.GetPlayers(true).size() + " alive");
+            int bombsArmed = 0;
+
+            for (TeamBomb bomb : bombs)
+            {
+                if (bomb.getTeam() == team && bomb.isArmed())
+                {
+                    bombsArmed++;
+                }
+            }
+            if (bombsArmed > 0)
+            {
+                GetScoreboard().Write(team.GetColor() + "" + bombsArmed + " Bomb" + (bombsArmed > 1 ? "s" : "") + " Armed");
+            }
+            else
+            {
+                GetScoreboard().Write("Bombs Safe");
+            }
+
+            if (itel.hasNext())
+            {
+                GetScoreboard().WriteBlank();
+            }
+        }
+
+        GetScoreboard().Draw();
+    }
+
+    @Override
+    @EventHandler
+    public void ScoreboardUpdate(UpdateEvent event)
+    {
+        if (event.getType() != UpdateType.FAST || this.GetState() != GameState.Live)
+        {
+            return;
+        }
+
+        drawScoreboard();
+    }
+
     @EventHandler
     public void onGameEnd(GameStateChangeEvent event)
     {

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/TeamBomb.java

@@ -7,6 +7,7 @@ import java.util.Random;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.hologram.Hologram;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.GameTeam;
@@ -98,18 +99,20 @@ class TeamBomb implements Comparable<TeamBomb>
         this._bombLocation = bombLocation;
     }
 
-    private void activateBomb(GameTeam gameTeam)
+    public void respawnBomb()
     {
-        if (!isArmed())
+        Location loc = getBlockLocation();
+        if (_bombEntity != null)
         {
-            _timeBombArmed = System.currentTimeMillis();
+            _bombEntity.remove();
-            getBlockLocation().getBlock().setType(Material.AIR);
+            loc = _bombEntity.getLocation();
+        }
         _game.CreatureAllowOverride = true;
         EntityTNTPrimed entity = new EntityTNTPrimed(((CraftWorld) getBlockLocation().getWorld()).getHandle());
         _game.CreatureAllowOverride = false;
-            double x = getBlockLocation().getX();
+        double x = loc.getX();
-            double y = getBlockLocation().getY() + 1;
+        double y = loc.getY() + 0.2;
-            double z = getBlockLocation().getZ();
+        double z = loc.getZ();
         entity.setPosition(x, y, z);
         entity.motY = 0.20000000298023224D;
         entity.fuseTicks = 120000;
@@ -118,10 +121,20 @@ class TeamBomb implements Comparable<TeamBomb>
         entity.lastZ = z;
         ((CraftWorld) getBlockLocation().getWorld()).getHandle().addEntity(entity, SpawnReason.CUSTOM);
         _bombEntity = (TNTPrimed) entity.getBukkitEntity();
-            _timeUntilExplode = 60;
+        _hologram.setLocation(getBomb().getLocation().add(0, .6, 0));
-            Bukkit.broadcastMessage(ChatColor.GOLD + "" + ChatColor.MAGIC + "ab " + gameTeam.GetColor() + gameTeam.GetName()
+        _hologram.setFollowEntity(getBomb());
-                    + ChatColor.RESET + ChatColor.GOLD + " just armed " + getTeam().GetColor() + getTeam().GetName() + " Team's"
+    }
-                    + ChatColor.RESET + ChatColor.GOLD + " bomb! " + ChatColor.MAGIC + "ab");
+
+    private void activateBomb(GameTeam gameTeam)
+    {
+        if (!isArmed())
+        {
+            _timeBombArmed = System.currentTimeMillis();
+            getBlockLocation().getBlock().setType(Material.AIR);
+            respawnBomb();
+            _timeUntilExplode = 40;
+            UtilTextMiddle.display("", gameTeam.GetColor() + gameTeam.GetName() + ChatColor.RESET + " armed "
+                    + getTeam().GetColor() + getTeam().GetName() + "'s" + ChatColor.RESET + " bomb");
             for (Player player : Bukkit.getOnlinePlayers())
             {
                 GameTeam hisTeam = _game.GetTeam(player);
@@ -133,13 +146,10 @@ class TeamBomb implements Comparable<TeamBomb>
             Collections.sort(_game.getBombs());
             _hologram.setText(getTeam().GetColor() + C.Bold + "Exploding in " + ChatColor.DARK_RED + ChatColor.BOLD
                     + getTimeUntilExplode());
-            _hologram.setLocation(getBomb().getLocation().add(0, .53, 0));
-            _hologram.setFollowEntity(getBomb());
         }
         else
         {
-            Bukkit.broadcastMessage(_owningTeam.GetColor() + _owningTeam.GetName() + " Team" + ChatColor.RESET + ChatColor.GOLD
+            UtilTextMiddle.display("", _owningTeam.GetColor() + _owningTeam.GetName() + ChatColor.RESET + " defused their bomb");
-                    + " have just defused their bomb!");
             restoreBomb();
         }
         _armers.clear();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitBow.java

@@ -1,7 +1,6 @@
 package nautilus.game.arcade.game.games.searchanddestroy.kits.bow;
 
 import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.itemstack.ItemStackFactory;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.castlesiege.kits.KitHuman;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -30,14 +29,19 @@ public class KitBow extends KitHuman
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
-        inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+            {
-        inv.setItem(9, new ItemStack(Material.ARROW, 1));
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
+        inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
+        inv.setItem(9, new ItemStack(Material.ARROW, 1));
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitPinner.java

@@ -1,14 +1,11 @@
 package nautilus.game.arcade.game.games.searchanddestroy.kits.bow;
 
-import mineplex.core.common.util.C;
 import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.itemstack.ItemStackFactory;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.games.castlesiege.kits.KitHuman;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
 import nautilus.game.arcade.kit.perks.PerkPinned;
-import nautilus.game.arcade.kit.perks.PerkQuickshot;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -28,24 +25,26 @@ public class KitPinner extends KitHuman
                     "Your arrows enchanted with gravity magic.", "Victims find it hard to lift", "Their bodies are sluggish"
             }, new Perk[]
             {
-        		new PerkQuickshot("Quickshot", 2, 8000),
                 new PerkPinned()
-            }, 
+            }, EntityType.SKELETON, new ItemStack(Material.OBSIDIAN));
-            EntityType.SKELETON, new ItemStack(Material.OBSIDIAN));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
-        inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot").setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+            {
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
-        
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitPunch.java

@@ -26,30 +26,30 @@ public class KitPunch extends KitHuman
     {
         super(manager, "Punch", KitAvailability.Hide, new String[]
             {
-                    "Your bow is super stretchy", 
+                    "Your bow is super stretchy", "Your arrows are huge", "What does this mean?",
-                    "Your arrows are huge", 
-                    "What does this mean?",
                     "Your arrows will knock em flying!"
-            }, 
+            }, new Perk[]
-            new Perk[]
             {
                 new PerkKnockbackArrow(2.5D)
-            }, 
+            }, EntityType.SKELETON, new ItemStack(Material.FENCE));
-            EntityType.SKELETON, new ItemStack(Material.FENCE));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
-        
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitQuickshooter.java

@@ -28,22 +28,26 @@ public class KitQuickshooter extends KitHuman
             }, new Perk[]
             {
                 new PerkQuickshot("Quickshot", 2, 8000)
-            }, 
+            }, EntityType.SKELETON, new ItemStack(Material.INK_SACK, 1, (short) 14));
-            EntityType.SKELETON, new ItemStack(Material.INK_SACK, 1, (short) 14));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot").setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot")
+                .setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
 
         player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
         player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
         player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
         player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitSharpshooter.java

@@ -27,24 +27,26 @@ public class KitSharpshooter extends KitHuman
                     "Max of +6. Missing an arrow resets the count to 0."
             }, new Perk[]
             {
-        		new PerkKnockbackArrow(2.5D),
+                    new PerkKnockbackArrow(2.5D), new PerkSharpshooter()
-                new PerkSharpshooter()
+            }, EntityType.SKELETON, new ItemStack(Material.FLINT));
-            }, 
-            EntityType.SKELETON, new ItemStack(Material.FLINT));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
     }
-
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitSniper.java

@@ -36,24 +36,27 @@ public class KitSniper extends KitHuman
                     "Arrows do 0.1 damage per block travelled.", "Shoot from afar to score major damage!"
             }, new Perk[]
             {
-        		new PerkKnockbackArrow(2.5D),
+                    new PerkKnockbackArrow(2.5D), new PerkSniper()
-                new PerkSniper()
+            }, EntityType.SKELETON, new ItemStack(Material.ARROW));
-            }, 
-            EntityType.SKELETON, new ItemStack(Material.ARROW));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitThunderstorm.java

@@ -26,27 +26,30 @@ public class KitThunderstorm extends KitHuman
             {
                 "Chargeup your bow to release a barrage of arrows." + "The longer you charge your bow"
                         + "The more arrows are added to the barrage."
-            }
+            }, new Perk[]
-        , new Perk[]
             {
-        		new PerkQuickshot("Quickshot", 2, 8000),
+                    new PerkQuickshot("Quickshot", 2, 8000), new PerkBarrage(10, 400, false, false, true)
-                new PerkBarrage(10, 400, false, false, true)
+            }, EntityType.SKELETON, new ItemStack(Material.ARROW, 16));
-            }, 
-            EntityType.SKELETON, new ItemStack(Material.ARROW, 16));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot").setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot")
+                .setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.CHAINMAIL_BOOTS), new ItemStack(Material.CHAINMAIL_LEGGINGS),
+                    new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
+            });
+        inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
-        
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET));
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS));
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitEvade.java

@@ -22,29 +22,31 @@ public class KitEvade extends Kit
 {
     public KitEvade(ArcadeManager manager)
     {
-		super(manager, "Evade", KitAvailability.Free, new String[]
+        super(manager, "Evade", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(), new PerkEvade()
-				new PerkShadowmeld(),
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-				new PerkEvade()
-			}, 
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
+                .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
 
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitFlash.java

@@ -22,29 +22,30 @@ public class KitFlash extends Kit
 {
     public KitFlash(ArcadeManager manager)
     {
-		super(manager, "Flash", KitAvailability.Free, new String[]
+        super(manager, "Flash", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(), new PerkFlash(1, false)
-				new PerkShadowmeld(),
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
-				new PerkFlash(1, false)
-			}, 
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitMultiFlash.java

@@ -22,29 +22,30 @@ public class KitMultiFlash extends Kit
 {
     public KitMultiFlash(ArcadeManager manager)
     {
-		super(manager, "Multi-Flash", KitAvailability.Free, new String[]
+        super(manager, "Multi-Flash", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(), new PerkFlash(4, false)
-				new PerkShadowmeld(),
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
-				new PerkFlash(4, false)
-			}, 
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitPhaseBlast.java

@@ -22,29 +22,31 @@ public class KitPhaseBlast extends Kit
 {
     public KitPhaseBlast(ArcadeManager manager)
     {
-		super(manager, "Phase Blast", KitAvailability.Free, new String[]
+        super(manager, "Phase Blast", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(), new PerkFlash(1, true)
-				new PerkShadowmeld(),
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
-				new PerkFlash(1, true)
-			}, 
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitRewind.java

@@ -24,32 +24,32 @@ public class KitRewind extends Kit
 
     public KitRewind(ArcadeManager manager)
     {
-		super(manager, "Rewind", KitAvailability.Free, new String[]
+        super(manager, "Rewind", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(), new PerkEvade(), new PerkRewind()
-				new PerkShadowmeld(),
-				new PerkEvade(),
-				new PerkRewind()
 
-			}, 
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
-		inv.addItem(new ItemBuilder(Material.NETHER_STAR).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Rewind").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
-		
+        inv.addItem(new ItemBuilder(Material.NETHER_STAR)
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Rewind").setUnbreakable(true).build());
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+        inv.setItem(8,
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitRogue.java

@@ -25,27 +25,29 @@ public class KitRogue extends Kit
         super(manager, "Rogue", KitAvailability.Free, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkShadowmeld(),
-				new PerkShadowmeld(),
 
-			}, 
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_AXE));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
 
-		player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS));
+                    new ItemStack(Material.LEATHER_BOOTS), new ItemStack(Material.LEATHER_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS));
+                    new ItemStack(Material.LEATHER_CHESTPLATE), new ItemStack(Material.LEATHER_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitWraith.java

@@ -21,25 +21,25 @@ public class KitWraith extends Kit
 {
     public KitWraith(ArcadeManager manager)
     {
-		super(manager, "Rewind", KitAvailability.Free, new String[]
+        super(manager, "Rewind", KitAvailability.Hide, new String[]
             {
 
-			}, 
+            }, new Perk[]
-			new Perk[] 
             {
-				new PerkSpeed(1),
+                    new PerkSpeed(1), new PerkWraith(), new PerkEvade()
-				new PerkWraith(),
-				new PerkEvade()
 
-			}, 
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-			EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-		inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
+                .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitAssault.java

@@ -7,9 +7,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import mineplex.core.common.util.C;
 import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.itemstack.ItemStackFactory;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -21,30 +19,30 @@ public class KitAssault extends Kit
 
     public KitAssault(ArcadeManager manager)
     {
-        super(manager, "Assault", KitAvailability.Free, new String[]
+        super(manager, "Assault", KitAvailability.Hide, new String[]
             {
-                   "Charge at enemies and cripple them!"
+                    "Bulls Charge ability.", "Temperary speed boost when activated.", "When attacking with the boost on",
-            }, 
+                    "The victim is stunned and slows down"
-            new Perk[] 
+            }, new Perk[]
             {
                 new PerkBullsCharge()
-    		},
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-            EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
+            {
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-        inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+        inv.setItem(8,
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitBeserker.java

@@ -22,31 +22,35 @@ public class KitBeserker extends Kit
 
     public KitBeserker(ArcadeManager manager)
     {
-        super(manager, "Beserker", KitAvailability.Free, new String[]
+        super(manager, "Beserker", KitAvailability.Hide, new String[]
             {
-                   "Leap and takedown your foes!"
+                "Leap and bullcharge your foes!"
-            }, 
+            }, new Perk[]
-            new Perk[] 
             {
-        		new PerkBullsCharge(),
+                    new PerkBullsCharge(), new PerkTakedown()
-        		new PerkTakedown()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-    		},
-            EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Takedown").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Takedown").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitBreaker.java

@@ -0,0 +1,51 @@
+package nautilus.game.arcade.game.games.searchanddestroy.kits.trooper;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemBuilder;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.kit.Kit;
+import nautilus.game.arcade.kit.KitAvailability;
+import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkTakedown;
+
+public class KitBreaker extends Kit
+{
+
+    public KitBreaker(ArcadeManager manager)
+    {
+        super(manager, "Breaker", KitAvailability.Hide, new String[]
+            {
+                    "Takedown - You leap forwards.", "If you collide with anyone midair, they take damage and knockback."
+            }, new Perk[]
+            {
+                new PerkTakedown()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
+    }
+
+    @Override
+    public void GiveItems(Player player)
+    {
+        PlayerInventory inv = player.getInventory();
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Takedown").setUnbreakable(true).build());
+
+        inv.setArmorContents(new ItemStack[]
+            {
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
+    }
+
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitChampion.java

@@ -21,31 +21,33 @@ public class KitChampion extends Kit
 {
     public KitChampion(ArcadeManager manager)
     {
-        super(manager, "Champion", KitAvailability.Free, new String[]
+        super(manager, "Champion", KitAvailability.Hide, new String[]
             {
                 "Grow stronger with every kill"
-            }, 
+            }, new Perk[]
-            new Perk[] 
             {
-        		new PerkBullsCharge(),
+                    new PerkBullsCharge(), new PerkChampion()
-        		new PerkChampion()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-    		},
-            EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitJuggernaut.java

@@ -22,31 +22,35 @@ public class KitJuggernaut extends Kit
 
     public KitJuggernaut(ArcadeManager manager)
     {
-        super(manager, "Juggernaut", KitAvailability.Free, new String[]
+        super(manager, "Juggernaut", KitAvailability.Hide, new String[]
             {
                 "Deals damage in a large area"
-            }, 
+            }, new Perk[]
-            new Perk[]
             {
-        		new PerkHarden(),
+                    new PerkHarden(false), new PerkSeismicSlamSND()
-        		new PerkSeismicSlamSND()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-    		}
-    		,EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Seismic Slam").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Seismic Slam").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTank.java

@@ -21,30 +21,33 @@ public class KitTank extends Kit
 
     public KitTank(ArcadeManager manager)
     {
-        super(manager, "Tank", KitAvailability.Free, new String[]
+        super(manager, "Tank", KitAvailability.Hide, new String[]
             {
                 "Able to absorb a lot of damage!"
-            }, 
+            }, new Perk[]
-            new Perk[]
             {
-        		new PerkHarden()
+                new PerkHarden(true)
-    		}
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-    		,EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTitan.java

@@ -21,31 +21,39 @@ public class KitTitan extends Kit
 {
     public KitTitan(ArcadeManager manager)
     {
-        super(manager, "Titan", KitAvailability.Free, new String[]
+        super(manager, "Titan", KitAvailability.Hide, new String[]
             {
                 "Master of survival!"
-            }, 
+            }, new Perk[]
-            new Perk[]
             {
-        		new PerkHarden(),
+                    new PerkHarden(false), new PerkDefensiveStance()
-        		new PerkDefensiveStance()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-    		}
-    		,EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Defensive Stance").setUnbreakable(true).build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD)
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
+                .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Defensive Stance").setUnbreakable(true)
+                .build());
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
+        inv.addItem(new ItemBuilder(Material.IRON_AXE)
+                .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setArmorContents(new ItemStack[]
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+            {
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
+
+        inv.setItem(8,
+                new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase())
+                        .setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTrooper.java

@@ -8,7 +8,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
 import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.itemstack.ItemStackFactory;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
@@ -22,24 +21,24 @@ public class KitTrooper extends Kit
         super(manager, "Trooper", KitAvailability.Free, new String[]
             {
                 "Full iron armor and 2 golden apples"
-            }, 
+            }, new Perk[0], EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
-            new Perk[0], 
-            EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.setArmorContents(new ItemStack[]
-        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
+            {
-        inv.addItem(new ItemBuilder(Material.IRON_AXE).setUnbreakable(true).build());
+                    new ItemStack(Material.IRON_BOOTS), new ItemStack(Material.IRON_LEGGINGS),
-        inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
+                    new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
+            });
 
-        player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.IRON_HELMET));
+        inv.setItem(2, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
-		player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.IRON_CHESTPLATE));
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
-		player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.IRON_LEGGINGS));
+        inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
-		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
+        inv.setItem(8, new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase()).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
+              inv.setItem(8, new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(this.Manager.GetGame().GetTeam(player).GetColorBase()).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use").build());
     }
 
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/KillButton.java

@@ -0,0 +1,39 @@
+package nautilus.game.arcade.gui.privateServer.button;
+
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.managers.GameHostManager;
+
+public class KillButton implements IButton
+{
+	private ArcadeManager _arcade;
+	private GameHostManager _manager;
+
+	public KillButton(ArcadeManager arcadeManager)
+	{
+		_manager = arcadeManager.GetGameHostManager();
+		_arcade = arcadeManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		if (clickType == clickType.SHIFT_RIGHT)
+		{
+			for (Player other : UtilServer.getPlayers())
+			{
+				UtilPlayer.message(player, C.cGold + C.Bold + "The host has closed this Mineplex Private Server.");
+				other.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
+				_arcade.GetPortal().SendPlayerToServer(other, "Lobby");
+			}
+			_manager.setHostExpired(true);
+		}
+	}
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/RemoveAdminButton.java

@@ -0,0 +1,28 @@
+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.GiveAdminPage;
+import nautilus.game.arcade.gui.privateServer.page.RemoveAdminPage;
+
+public class RemoveAdminButton implements IButton
+{
+	private ArcadeManager _arcadeManager;
+	private PrivateServerShop _shop;
+
+	public RemoveAdminButton(ArcadeManager arcadeManager, PrivateServerShop shop)
+	{
+		_shop = shop;
+		_arcadeManager = arcadeManager;
+	}
+
+	@Override
+	public void onClick(Player player, ClickType clickType)
+	{
+		_shop.OpenPageForPlayer(player, new RemoveAdminPage(_arcadeManager, _shop, player));
+	}
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/BanPage.java

@@ -1,6 +1,9 @@
 package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
@@ -8,7 +11,7 @@ public class BanPage extends PlayerPage
 {
 	public BanPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
-		super(plugin, shop, "Ban Players", player);
+		super(plugin, shop, "Remove Players", player);
 		BuildPage();
 	}
 
@@ -23,11 +26,12 @@ public class BanPage extends PlayerPage
 	{
 		RemoveButton(slot);
 		_manager.ban(player);
+		UtilPlayer.message(Player, F.main("Server", "You have removed " + F.name(player.getName()) + " from this private server."));
 	}
 
 	@Override
 	public String getDisplayString(Player player)
 	{
-		return "Click to Ban Player";
+		return "Click to Remove Player";
 	}
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/EditRotationPage.java

@@ -29,12 +29,39 @@ public class EditRotationPage extends BasePage
 	{
 		addBackButton(4);
 
-		int slot = 9;
 		List<GameType> enabledGames = Plugin.GetServerConfig().GameList;
+
+		int arcadeSlot = 9;
+		int classicSlot = 13;
+		int survivalSlot = 15;
+		int championSlot = 17;
+
 		for (GameType type : _manager.getAvailableGames(Player))
 		{
+			int slot;
+
+			switch(type.getGameCategory())
+			{
+				case CLASSICS:
+					slot = classicSlot;
+					classicSlot += 9;
+					break;
+				case SURVIVAL:
+					slot = survivalSlot;
+					survivalSlot += 9;
+					break;
+				case CHAMPIONS:
+					slot = championSlot;
+					championSlot += 9;
+					break;
+				default: // arcade
+					slot = arcadeSlot;
+					arcadeSlot++;
+					if (arcadeSlot % 9 == 3)
+						arcadeSlot += 6;
+			}
+
 			addGameButton(slot, type, enabledGames.contains(type));
-			slot++;
 		}
 	}
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GiveAdminPage.java

@@ -2,6 +2,8 @@ package nautilus.game.arcade.gui.privateServer.page;
 
 import org.bukkit.entity.Player;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
 
@@ -24,6 +26,7 @@ public class GiveAdminPage extends PlayerPage
 	{
 		RemoveButton(slot);
 		_manager.giveAdmin(player);
+		UtilPlayer.message(Player, F.main("Server", "You gave " + F.name(player.getName()) + " admin power."));
 	}
 
 	@Override

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/MenuPage.java

@@ -5,12 +5,15 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+import mineplex.core.common.util.C;
 import mineplex.core.shop.item.ShopItem;
 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.GiveAdminButton;
+import nautilus.game.arcade.gui.privateServer.button.KillButton;
+import nautilus.game.arcade.gui.privateServer.button.RemoveAdminButton;
 import nautilus.game.arcade.gui.privateServer.button.SetGameButton;
 import nautilus.game.arcade.gui.privateServer.button.OptionsButton;
 import nautilus.game.arcade.gui.privateServer.button.StartGameButton;
@@ -31,29 +34,41 @@ public class MenuPage extends BasePage
 		ItemStack ownerHead = getOwnerHead();
 		setItem(4, ownerHead);
 
+		boolean host = _manager.isHost(Player);
+
 		StartGameButton startGameButton = new StartGameButton(Plugin);
-		AddButton(1 + 9, new ShopItem(Material.EMERALD_BLOCK, "Start Game", new String[] {}, 1, false), startGameButton);
+		AddButton(host ? 9 : 1 + 9, new ShopItem(Material.EMERALD_BLOCK, "Start Game", new String[] {}, 1, false), startGameButton);
 		
 		StopGameButton stopGameButton = new StopGameButton(Plugin);
-		AddButton(1 + 18, new ShopItem(Material.REDSTONE_BLOCK, "Stop Game", new String[] {}, 1, false), stopGameButton);
+		AddButton(host ? 18 : 1 + 18, new ShopItem(Material.REDSTONE_BLOCK, "Stop Game", new String[] {}, 1, false), stopGameButton);
 		
 		SetGameButton setGameButton = new SetGameButton(Plugin, Shop);
-		AddButton(3 + 9, new ShopItem(Material.BOOK_AND_QUILL, "Set Game", new String[] {}, 1, false), setGameButton);
+		AddButton(host ? 2 + 9 : 3 + 9, new ShopItem(Material.BOOK_AND_QUILL, "Set Game", new String[] {}, 1, false), setGameButton);
 
 		EditRotationButton editRotationButton = new EditRotationButton(Plugin, Shop);
-		AddButton(3 + 18, new ShopItem(Material.BOOK, "Edit Game Rotation", new String[]{}, 1, false), editRotationButton);
+		AddButton(host ? 2 + 18 : 3 + 18, new ShopItem(Material.BOOK, "Edit Game Rotation", new String[]{}, 1, false), editRotationButton);
 
+		if (host)
+		{
 			GiveAdminButton giveAdminButton = new GiveAdminButton(Plugin, Shop);
-		AddButton(5 + 9, new ShopItem(Material.DIAMOND_SWORD, "Give Admin", new String[] {}, 1, false), giveAdminButton);
+			AddButton(4 + 9, new ShopItem(Material.DIAMOND_SWORD, "Give Admin", new String[]{}, 1, false), giveAdminButton);
+
+			RemoveAdminButton removeAdminButton = new RemoveAdminButton(Plugin, Shop);
+			AddButton(4 + 18, new ShopItem(Material.GOLD_SWORD, "Remove Admin", new String[]{}, 1, false), removeAdminButton);
+
+			KillButton killButton = new KillButton(Plugin);
+			AddButton(8 + 18, new ShopItem(Material.TNT, "Kill Private Server",
+					new String[] { ChatColor.RESET + C.cGray + "Shift-Right Click to Kill Private Server" }, 1, false), killButton);
+		}
 
 		OptionsButton optionsButton = new OptionsButton(Plugin, Shop);
-		AddButton(5 + 18, new ShopItem(Material.REDSTONE_COMPARATOR, "Game Options", new String[] {}, 1, false), optionsButton);
+		AddButton(host ? 8 + 9 : 5 + 9, new ShopItem(Material.REDSTONE_COMPARATOR, "Game Options", new String[] {}, 1, false), optionsButton);
 
 		BanButton banButton = new BanButton(Plugin, Shop);
-		AddButton(7 + 9, new ShopItem(Material.LAVA_BUCKET, "Ban Player", new String[] {}, 1, false), banButton);
+		AddButton(host ? 6 + 9 : 7 + 9, new ShopItem(Material.LAVA_BUCKET, "Remove Player", new String[] {}, 1, false), banButton);
 
 		UnbanButton unbanButton = new UnbanButton(Plugin, Shop);
-		AddButton(7 + 18, new ShopItem(Material.WATER_BUCKET, "Unban Player", new String[] {}, 1, false), unbanButton);
+		AddButton(host ? 6 + 18 : 7 + 18, new ShopItem(Material.WATER_BUCKET, "Un-Remove Player", new String[] {}, 1, false), unbanButton);
 	}
 
 	private ItemStack getOwnerHead()

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/RemoveAdminPage.java

@@ -0,0 +1,59 @@
+package nautilus.game.arcade.gui.privateServer.page;
+
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.shop.item.IButton;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
+
+public class RemoveAdminPage extends BasePage
+{
+	public RemoveAdminPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
+	{
+		super(plugin, shop, "Remove Admin", player);
+
+		BuildPage();
+	}
+
+	@Override
+	protected void BuildPage()
+	{
+		addBackButton(4);
+
+		HashSet<String> admins = _manager.getAdminList();
+		Iterator<String> iterator = admins.iterator();
+
+		int slot = 9;
+		while (iterator.hasNext())
+		{
+			String name = iterator.next();
+			ItemStack head = getPlayerHead(name, C.cGreen + C.Bold + name, new String[] {ChatColor.RESET + C.cGray + "Click to Remove Admin"});
+			AddButton(slot, head, getRemoveAdminButton(slot, name));
+
+			slot++;
+		}
+	}
+
+	private IButton getRemoveAdminButton(final int slot, final String playerName)
+	{
+		return new IButton()
+		{
+			@Override
+			public void onClick(Player player, ClickType clickType)
+			{
+				_manager.removeAdmin(playerName);
+				RemoveButton(slot);
+				UtilPlayer.message(Player, F.main("Server", "You removed admin power from " + F.name(playerName) + "."));
+			}
+		};
+	}
+}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java

@@ -24,11 +24,37 @@ public class SetGamePage extends BasePage
 	{
 		addBackButton(4);
 
-		int slot = 9;
+		int arcadeSlot = 9;
+		int classicSlot = 13;
+		int survivalSlot = 15;
+		int championSlot = 17;
+
 		for (GameType type : _manager.getAvailableGames(Player))
 		{
+			int slot;
+
+			switch(type.getGameCategory())
+			{
+				case CLASSICS:
+					slot = classicSlot;
+					classicSlot += 9;
+					break;
+				case SURVIVAL:
+					slot = survivalSlot;
+					survivalSlot += 9;
+					break;
+				case CHAMPIONS:
+					slot = championSlot;
+					championSlot += 9;
+					break;
+				default: // arcade
+					slot = arcadeSlot;
+					arcadeSlot++;
+					if (arcadeSlot % 9 == 3)
+						arcadeSlot += 6;
+			}
+
 			addGameButton(slot, type);
-			slot++;
 		}
 	}
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/UnbanPage.java

@@ -9,6 +9,8 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.shop.item.IButton;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
@@ -17,7 +19,7 @@ public class UnbanPage extends BasePage
 {
 	public UnbanPage(ArcadeManager plugin, PrivateServerShop shop, Player player)
 	{
-		super(plugin, shop, "Unban Players", player);
+		super(plugin, shop, "Un-Remove Players", player);
 
 		BuildPage();
 	}
@@ -34,7 +36,7 @@ public class UnbanPage extends BasePage
 		while (iterator.hasNext())
 		{
 			String name = iterator.next();
-			ItemStack head = getPlayerHead(name, C.cGreen + C.Bold + name, new String[] {ChatColor.RESET + C.cGray + "Click to Unban"});
+			ItemStack head = getPlayerHead(name, C.cGreen + C.Bold + name, new String[] {ChatColor.RESET + C.cGray + "Click to Un-Remove Player"});
 			AddButton(slot, head, getUnbanButton(slot, name));
 
 			slot++;
@@ -59,6 +61,7 @@ public class UnbanPage extends BasePage
 			{
 				_manager.getBlacklist().remove(playerName);
 				RemoveButton(slot);
+				UtilPlayer.message(Player, F.main("Server", F.name(playerName) + " can now join this private server."));
 			}
 		};
 	}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDefensiveStance.java

@@ -64,7 +64,7 @@ public class PerkDefensiveStance extends Perk
 		if (damagee == null)	
 			return;
 
-		if (_useTime.containsKey(damagee))
+		if (!_useTime.containsKey(damagee))
 			return;
 		
 		if (!UtilTime.elapsed(_useTime.get(damagee), 500))

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFlash.java

@@ -45,7 +45,6 @@ public class PerkFlash extends Perk
         _explode = explode;
     }
 
-	
     @EventHandler
     public void addCharge(UpdateEvent event)
     {
@@ -57,6 +56,9 @@ public class PerkFlash extends Perk
 
         for (Player cur : Manager.GetGame().GetPlayers(true))
         {
+            if (!Kit.HasKit(cur))
+                continue;
+
             if (!_charges.containsKey(cur))
             {
                 _charges.put(cur, 0);
@@ -73,8 +75,8 @@ public class PerkFlash extends Perk
 
                 _charges.put(cur, charges + 1);
 
-				//Inform
+                // Inform
-				UtilPlayer.message(cur, F.main("Game", "Flash Charges: " + F.elem((charges + 1)+"")));
+                UtilPlayer.message(cur, F.main("Game", "Flash Charges: " + F.elem((charges + 1) + "")));
             }
         }
     }
@@ -99,7 +101,7 @@ public class PerkFlash extends Perk
         if (!Kit.HasKit(player))
             return;
 
-		//Use Recharge
+        // Use Recharge
         if (_maxCharges <= 1)
         {
             Recharge.Instance.use(player, "Flash", 8000, true, true);
@@ -123,43 +125,45 @@ public class PerkFlash extends Perk
         double curRange = 0;
         while (curRange <= maxRange)
         {
-			Location newTarget = player.getLocation().add(new Vector(0,0.2,0)).add(player.getLocation().getDirection().multiply(curRange));
+            Location newTarget = player.getLocation().add(new Vector(0, 0.2, 0))
+                    .add(player.getLocation().getDirection().multiply(curRange));
 
-			if (!UtilBlock.airFoliage(newTarget.getBlock()) || 
+            if (!UtilBlock.airFoliage(newTarget.getBlock())
-				!UtilBlock.airFoliage(newTarget.getBlock().getRelative(BlockFace.UP)))
+                    || !UtilBlock.airFoliage(newTarget.getBlock().getRelative(BlockFace.UP)))
                 break;
 
-			//Progress Forwards
+            // Progress Forwards
             curRange += 0.2;
 
-			//Smoke Trail
+            // Smoke Trail
             UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, newTarget.clone().add(0, 0.5, 0), 0, 0, 0, 0, 1);
         }
 
-		//Modify Range
+        // Modify Range
         curRange -= 0.4;
         if (curRange < 0)
             curRange = 0;
 
-		//Destination
+        // Destination
-		Location loc = player.getLocation().add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0)));
+        Location loc = player.getLocation()
+                .add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0)));
 
         if (curRange > 0)
             player.teleport(loc);
 
         player.setFallDistance(0);
 
-		//Inform
+        // Inform
-		UtilPlayer.message(player, F.main("Game", "Flash Charges: " + F.elem(_charges.get(player)+"")));
+        UtilPlayer.message(player, F.main("Game", "Flash Charges: " + F.elem(_charges.get(player) + "")));
 
-		//Effect
+        // Effect
         player.getWorld().playSound(player.getLocation(), Sound.WITHER_SHOOT, 0.4f, 1.2f);
         player.getWorld().playSound(player.getLocation(), Sound.SILVERFISH_KILL, 1f, 1.6f);
 
-		//Phase Blast
+        // Phase Blast
         if (_explode)
         {
-			//Particle
+            // Particle
             UtilFirework.playFirework(loc, Type.BALL_LARGE, Manager.GetGame().GetTeam(player).GetColorBase(), false, false);
 
             HashMap<LivingEntity, Double> targets = UtilEnt.getInRadius(player.getLocation(), 4);
@@ -171,7 +175,7 @@ public class PerkFlash extends Perk
                 if (cur.equals(player))
                     continue;
 
-				Player other = (Player)cur;
+                Player other = (Player) cur;
 
                 if (!Manager.GetGame().IsAlive(other))
                     continue;
@@ -179,10 +183,9 @@ public class PerkFlash extends Perk
                 if (Manager.GetGame().GetTeam(other).equals(Manager.GetGame().GetTeam(player)))
                     continue;
 
-				//Damage Event
+                // Damage Event
-				Manager.GetDamage().NewDamageEvent(cur, player, null, 
+                Manager.GetDamage().NewDamageEvent(cur, player, null, DamageCause.CUSTOM, 8, true, true, false, player.getName(),
-						DamageCause.CUSTOM, 8, true, true, false,
+                        "Phase Blast");
-						player.getName(), "Phase Blast");
             }
         }
     }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHarden.java

@@ -5,6 +5,7 @@ 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;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -16,12 +17,15 @@ import nautilus.game.arcade.kit.Perk;
 
 public class PerkHarden extends Perk
 {
-	public PerkHarden() 
+    private boolean _isSword;
+
+    public PerkHarden(boolean isSword)
     {
         super("Harden", new String[]
             {
                 C.cYellow + "Right-Click" + C.cGray + " with Axe to use " + C.cGreen + "Harden"
             });
+        _isSword = isSword;
     }
 
     @EventHandler
@@ -36,7 +40,8 @@ public class PerkHarden extends Perk
         if (UtilBlock.usable(event.getClickedBlock()))
             return;
         
-		if (!UtilGear.isAxe(event.getPlayer().getItemInHand()))
+        ItemStack item = event.getPlayer().getItemInHand();
+        if (_isSword ? !UtilGear.isSword(item) : !UtilGear.isAxe(item))
             return;
 
         Player player = event.getPlayer();
@@ -47,15 +52,14 @@ public class PerkHarden extends Perk
         if (!Recharge.Instance.use(player, GetName(), 30000, true, true))
             return;
 
-		//Action
+        // Action
         Manager.GetCondition().Factory().Slow(GetName(), player, player, 8, 1, false, false, false, false);
         Manager.GetCondition().Factory().HealthBoost(GetName(), player, player, 8, 3, false, false, false);
 
-		//Inform
+        // Inform
         UtilPlayer.message(player, F.main("Game", "You used " + F.skill(GetName()) + "."));
 
-		//Effect
+        // Effect
         player.getWorld().playSound(player.getLocation(), Sound.HORSE_ARMOR, 1f, 1f);
     }
-
 }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkPinned.java

@@ -27,17 +27,17 @@ public class PerkPinned extends Perk
             });
     }
 
-    private NautHashMap<LivingEntity, Integer> _secondsPinned = new NautHashMap<LivingEntity, Integer>();
+    private NautHashMap<LivingEntity, Integer> _ticksPinned = new NautHashMap<LivingEntity, Integer>();
 
     @EventHandler
     public void onSecond(UpdateEvent event)
     {
-        if (event.getType() != UpdateType.FASTER)
+        if (event.getType() != UpdateType.FASTEST)
         {
             return;
         }
 
-        Iterator<LivingEntity> itel = _secondsPinned.keySet().iterator();
+        Iterator<LivingEntity> itel = _ticksPinned.keySet().iterator();
         while (itel.hasNext())
         {
             LivingEntity entity = itel.next();
@@ -46,14 +46,14 @@ public class PerkPinned extends Perk
                 itel.remove();
                 continue;
             }
-            entity.setVelocity(entity.getVelocity().add(new Vector(0, -1, 0)));
+            entity.setVelocity(entity.getVelocity().add(new Vector(0, -0.2, 0)));
-            if (_secondsPinned.get(entity) <= 1)
+            if (_ticksPinned.get(entity) <= 1)
             {
                 itel.remove();
             }
             else
             {
-                _secondsPinned.put(entity, _secondsPinned.get(entity) - 1);
+                _ticksPinned.put(entity, _ticksPinned.get(entity) - 1);
             }
         }
     }
@@ -67,9 +67,9 @@ public class PerkPinned extends Perk
             if (player != null && this.Kit.HasKit(player))
             {
                 LivingEntity entity = event.GetDamageeEntity();
-                entity.setVelocity(entity.getVelocity().add(new Vector(0, -1, 0)));
+                entity.setVelocity(entity.getVelocity().add(new Vector(0, -0.4, 0)));
                 entity.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 40, 1), true);
-                _secondsPinned.put(entity, 8);
+                _ticksPinned.put(entity, 40);
             }
         }
     }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRangedBleeding.java

@@ -32,7 +32,7 @@ public class PerkRangedBleeding extends Perk
             return;
         }
 
-        Iterator<LivingEntity> itel = _secondsBleeding.keySet().iterator();
+        Iterator<LivingEntity> itel = _timeBleeding.keySet().iterator();
         while (itel.hasNext())
         {
             LivingEntity entity = itel.next();
@@ -41,20 +41,21 @@ public class PerkRangedBleeding extends Perk
                 itel.remove();
                 continue;
             }
-            Manager.GetDamage().NewDamageEvent(entity, null, null, DamageCause.CUSTOM, 2, false, true, true, "Bleed",
+            Manager.GetDamage().NewDamageEvent(entity, null, null, DamageCause.CUSTOM, 1, false, true, true, "Bleed",
                     "Stitcher Bleeding");
-            if (_secondsBleeding.get(entity) <= 1)
+            // TODO Bleed particles?
+            if (_timeBleeding.get(entity) <= 1)
             {
                 itel.remove();
             }
             else
             {
-                _secondsBleeding.put(entity, _secondsBleeding.get(entity) - 1);
+                _timeBleeding.put(entity, _timeBleeding.get(entity) - 1);
             }
         }
     }
 
-    private NautHashMap<LivingEntity, Integer> _secondsBleeding = new NautHashMap<LivingEntity, Integer>();
+    private NautHashMap<LivingEntity, Integer> _timeBleeding = new NautHashMap<LivingEntity, Integer>();
 
     @EventHandler(ignoreCancelled = true)
     public void onDamage(CustomDamageEvent event)
@@ -65,13 +66,13 @@ public class PerkRangedBleeding extends Perk
             if (player != null && Kit.HasKit(player))
             {
                 LivingEntity entity = event.GetDamageeEntity();
-                if (!_secondsBleeding.containsKey(entity))
+                if (!_timeBleeding.containsKey(entity))
                 {
-                    _secondsBleeding.put(entity, 4);
+                    _timeBleeding.put(entity, 4);
                 }
                 else
                 {
-                    _secondsBleeding.put(entity, _secondsBleeding.get(entity) + 4);
+                    _timeBleeding.put(entity, _timeBleeding.get(entity) + 4);
                 }
             }
         }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWraith.java

@@ -31,9 +31,7 @@ public class PerkWraith extends Perk
     {
         super("Invisibility", new String[]
             {
-				"You are permanently invisible.",
+                    "You are permanently invisible.", "Enemies are able to see your weapon", "and a trail of footsteps."
-				"Enemies are able to see your weapon",
-				"and a trail of footsteps."
             });
     }
 
@@ -70,6 +68,9 @@ public class PerkWraith extends Perk
 
         for (Player player : Manager.GetGame().GetPlayers(true))
         {
+            if (!Kit.HasKit(player))
+                continue;
+            
             if (!UtilEnt.isGrounded(player))
                 continue;
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java

@@ -10,6 +10,7 @@ import mineplex.core.common.util.UtilTime;
 import mineplex.core.timing.TimingManager;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
+import mineplex.minecraft.game.core.combat.CombatManager.AttackReason;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.Game;
@@ -161,6 +162,7 @@ public class GameCreationManager implements Listener
 		Manager.GetExplosion().SetTNTSpread(true);
 //		Manager.GetAntiStack().SetEnabled(true);
 		Manager.getCosmeticManager().setHideParticles(false);
+		Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName);
 		
 		HashMap<String, ChatColor> pastTeams = null;
 		
@@ -185,6 +187,9 @@ public class GameCreationManager implements Listener
 			}
 		}
 		
+		//Champions
+		Manager.toggleChampionsModules(gameType);
+		
 		_lastGames.add(0, gameType);
 
 		//Make Game

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java

@@ -43,9 +43,10 @@ public class GameHostManager implements Listener
 	private Player _host;
 	private Rank _hostRank;
 	private long _serverStartTime = System.currentTimeMillis();
-	private long _serverExpireTime = 43200000;
+	private long _serverExpireTime = 21600000;
 	private long _lastOnline = System.currentTimeMillis();
 	private long _expireTime = 300000;
+	private boolean _hostExpired = false;
 
 	private HashSet<Player> _onlineAdmins = new HashSet<Player>();
 	private HashSet<String> _adminList = new HashSet<String>();
@@ -60,27 +61,6 @@ public class GameHostManager implements Listener
 		_shop = new PrivateServerShop(manager, manager.GetClients(), manager.GetDonation());
 		Manager.GetPluginManager().registerEvents(this, Manager.GetPlugin());
 		
-		//Game Rotation
-		if (Manager.GetServerConfig().GameList.contains(GameType.ChampionsDominate) || 
-			Manager.GetServerConfig().GameList.contains(GameType.ChampionsDominate))
-		{
-			Iterator<GameType> gameIterator = Manager.GetServerConfig().GameList.iterator();
-			
-			//Remove Non-Champion Games
-			while (gameIterator.hasNext())
-			{
-				GameType type = gameIterator.next();
-				
-				if (type != GameType.ChampionsDominate && type != GameType.ChampionsDominate)
-					gameIterator.remove();
-			}
-			
-			//Hero Games
-			heroGames.add(GameType.ChampionsDominate);
-			heroGames.add(GameType.ChampionsTDM);
-		}
-		else
-		{
 		//Ultra Games
 		ultraGames.add(GameType.Smash);
 		
@@ -99,6 +79,8 @@ public class GameHostManager implements Listener
 		ultraGames.add(GameType.Spleef);
 
 		//Hero Games
+		heroGames.add(GameType.ChampionsDominate);
+		heroGames.add(GameType.ChampionsTDM);
 		heroGames.add(GameType.HideSeek);
 		heroGames.add(GameType.Draw);
 
@@ -107,7 +89,6 @@ public class GameHostManager implements Listener
 		legendGames.add(GameType.SurvivalGames);
 		legendGames.add(GameType.CastleSiege);
 		//legendGames.add(GameType.MineStrike);
-		}
 		
 		//Config Defaults
 		if (Manager.GetHost() != null && Manager.GetHost().length() > 0)
@@ -129,13 +110,14 @@ public class GameHostManager implements Listener
 		// Admins update
 		for (Player player : UtilServer.getPlayers())
 		{
-			if (player.equals(_host) || _adminList.contains(player.getName()) || Manager.GetClients().Get(player).GetRank().Has(Rank.MODERATOR))
+			if (player.equals(_host) || _adminList.contains(player.getName()) || Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN))
 			{
 				if (Manager.GetGame() == null || Manager.GetGame().GetState() == GameState.Recruit)
 					giveAdminItem(player);
-				
-				_lastOnline = System.currentTimeMillis();
 			}
+			
+			if (player.equals(_host))
+				_lastOnline = System.currentTimeMillis();
 		}
 	}
 
@@ -180,7 +162,12 @@ public class GameHostManager implements Listener
 		if (Manager.GetHost() == null || Manager.GetHost().length() == 0)
 			return false;
 		
-		return UtilTime.elapsed(_lastOnline, _expireTime) || UtilTime.elapsed(_serverStartTime, _serverExpireTime);
+		return _hostExpired || UtilTime.elapsed(_lastOnline, _expireTime) || UtilTime.elapsed(_serverStartTime, _serverExpireTime);
+	}
+
+	public void setHostExpired(boolean expired)
+	{
+		_hostExpired = expired;
 	}
 	
 	private void giveAdminItem(Player player)
@@ -194,6 +181,14 @@ public class GameHostManager implements Listener
 		player.getInventory().setItem(7, ItemStackFactory.Instance.CreateStack(Material.BLAZE_POWDER, (byte)0, 1, C.cGreen + C.Bold + "/menu"));
 	}
 
+	private void removeAdminItem(Player player)
+	{
+		if (player.getInventory().getItem(7).getType() == Material.BLAZE_POWDER)
+		{
+			player.getInventory().setItem(7, null);
+		}
+	}
+	
 	public HashSet<String> getWhitelist()
 	{
 		return _whitelist;
@@ -241,7 +236,7 @@ public class GameHostManager implements Listener
 
 	public boolean isAdmin(Player player, boolean includeStaff)
 	{
-		return player.equals(_host) || _adminList.contains(player.getName()) || (includeStaff && Manager.GetClients().Get(player).GetRank().Has(Rank.MODERATOR));
+		return player.equals(_host) || _adminList.contains(player.getName()) || (includeStaff && Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN));
 	}
 
 	public boolean isHost(Player player)
@@ -373,6 +368,22 @@ public class GameHostManager implements Listener
 		UtilPlayer.message(player, F.main("Server", "You were given admin privileges."));
 	}
 
+	public void removeAdmin(String playerName)
+	{
+		_adminList.remove(playerName);
+		Player player = UtilPlayer.searchExact(playerName);
+		if (player != null)
+		{
+			_onlineAdmins.remove(player);
+			removeAdminItem(player);
+			if (_shop.isPlayerInShop(player))
+			{
+				player.closeInventory();
+			}
+			UtilPlayer.message(player, F.main("Server", "Your admin privileges were removed."));
+		}
+	}
+	
 	public boolean isAdminOnline()
 	{
 		return _onlineAdmins.isEmpty();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java

@@ -1,13 +1,8 @@
 package nautilus.game.arcade.scoreboard;
 
 import java.util.ArrayList;
-import java.util.HashSet;
-
-import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilMath;
-import mineplex.core.common.util.UtilTime;
-import mineplex.core.common.util.UtilTime.TimeUnit;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
 
@@ -16,6 +11,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.DisplaySlot;
 import org.bukkit.scoreboard.Objective;
+import org.bukkit.scoreboard.Score;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
@@ -27,7 +23,7 @@ public class GameScoreboard
     private Objective _sideObjective;
 
     private ArrayList<ScoreboardElement> _elements = new ArrayList<ScoreboardElement>();
-	private String[] _current = new String[15];
+    private char[] _chars = "1234567890abcdefghijklmnopqrstuvwxyz".toCharArray();
 
     private String _title;
     private int _shineIndex;
@@ -41,10 +37,10 @@ public class GameScoreboard
 
         _title = "   MINEPLEX   ";
 
-		//Scoreboard
+        // Scoreboard
         _scoreboard = Bukkit.getScoreboardManager().getNewScoreboard();
 
-		_sideObjective = _scoreboard.registerNewObjective("Obj"+UtilMath.r(999999999), "dummy");
+        _sideObjective = _scoreboard.registerNewObjective("Obj" + UtilMath.r(999999999), "dummy");
         _sideObjective.setDisplaySlot(DisplaySlot.SIDEBAR);
         _sideObjective.setDisplayName(C.Bold + _title);
     }
@@ -72,7 +68,7 @@ public class GameScoreboard
             out = C.cWhite + C.Bold;
         }
 
-		for (int i=0 ; i < _title.length() ; i++)
+        for (int i = 0; i < _title.length(); i++)
         {
             char c = _title.charAt(i);
 
@@ -93,7 +89,6 @@ public class GameScoreboard
                     out += C.cGold + C.Bold;
             }
 
-			
             out += c;
         }
 
@@ -101,7 +96,7 @@ public class GameScoreboard
 
         _shineIndex++;
 
-		if (_shineIndex == _title.length()*2)
+        if (_shineIndex == _title.length() * 2)
         {
             _shineIndex = 0;
             _shineDirection = !_shineDirection;
@@ -117,10 +112,9 @@ public class GameScoreboard
     {
         System.out.println("Creating Scoreboard Teams.");
 
-		
         _scoreboard.registerNewTeam(ParseTeamName("SPEC")).setPrefix(ChatColor.GRAY + "");
 
-		//Team Groups
+        // Team Groups
         for (GameTeam team : Game.GetTeamList())
         {
             System.out.println("Scoreboard Team: " + team.GetName().toUpperCase());
@@ -192,8 +186,21 @@ public class GameScoreboard
 
     public String Clean(String line)
     {
-		if (line.length() >= 16)
+        if (line.length() > 28)
-			line = line.substring(0, 15);
+        {
+            // Due to the scoreboard using teams, You can use prefix and suffix for a total length of 32.
+            // this means that the total length of the string can't extend 32.
+            // Reason for the fancy logic is that the beginning of the suffix needs to use colors from line1 else the line is pure
+            // white. And line2 can't have its length extend 16..
+            String line1 = line.substring(0, 16);
+            String color = ChatColor.getLastColors(line1);
+            String line2 = line.substring(16);
+            int length = 16 - (color + line2).length();
+            if (length > 0)
+            {
+                return line1 + line2.substring(0, line2.length() - length);
+            }
+        }
 
         return line;
     }
@@ -216,7 +223,7 @@ public class GameScoreboard
         {
             if (elem instanceof ScoreboardElementScores)
             {
-				ScoreboardElementScores scores = (ScoreboardElementScores)elem;
+                ScoreboardElementScores scores = (ScoreboardElementScores) elem;
 
                 if (scores.IsKey(key))
                 {
@@ -236,87 +243,61 @@ public class GameScoreboard
 
     public void Draw()
     {
-		if (_debug)		System.out.println();
+        if (_debug)
-		if (_debug)		System.out.println("/////////////////////////");
+            System.out.println();
+        if (_debug)
+            System.out.println("/////////////////////////");
 
-		//Generate Lines
+        // Generate Lines
         ArrayList<String> newLines = new ArrayList<String>();
 
         for (ScoreboardElement elem : _elements)
         {
             for (String line : elem.GetLines())
             {
-				//Ensure no duplicate lines
-				while (true)
-				{
-					boolean matched = false;
-
-					for (String otherLine : newLines)
-					{
-						if (line.equals(otherLine))
-						{
-							line += ChatColor.RESET;
-							matched = true;
-						}
-					}
-
-					if (!matched)
-						break;
-				}
-
                 newLines.add(line);
             }
         }
 
-		//Find Changes
+        int i = 0;
-		HashSet<Integer> toAdd = new HashSet<Integer>();
+        while (true)
-		HashSet<Integer> toDelete = new HashSet<Integer>();
-
-		for (int i=0 ; i<15 ; i++)
         {
-			//Delete Old Excess Row
+            if (i >= _chars.length)
-			if (i >= newLines.size())
+                break;
+            String str = ChatColor.COLOR_CHAR + "" + _chars[i] + ChatColor.RESET;
+            Score score = GetObjectiveSide().getScore(str);
+            if (newLines.size() <= i)
             {
-				if (_current[i] != null)
+                if (score.isScoreSet())
                 {
-					if (_debug)		System.out.println("Delete: " + i + " [" + _current[i] + "]");
+                    ResetScore(str);
-					toDelete.add(i);
                 }
-
+                else
-				continue;
-			}
-
-			//Update or Add Row
-			if (_current[i] == null || !_current[i].equals(newLines.get(i)))
                 {
-				if (_debug)		System.out.println("Update: " + i + " [" + newLines.get(i) + "]");
+                    break;
-				toDelete.add(i);
-				toAdd.add(i);
                 }
             }
-
+            else
-		//Delete Elements - Must happen before Add
-		for (int i : toDelete)
             {
-			//Remove Old Line at Index
+                Team team = GetScoreboard().getTeam(str);
-			if (_current[i] != null) 
+                if (team == null)
                 {
-				if (_debug)		System.out.println("Deleting: " + i + " [" + _current[i] + "]");
+                    team = GetScoreboard().registerNewTeam(str);
-
+                    team.addEntry(str);
-				ResetScore(_current[i]);
+                }
-				_current[i] = null;
+                String line = newLines.get(i);
+                team.setPrefix(line.substring(0, Math.min(line.length(), 16)));
+                team.setSuffix(ChatColor.getLastColors(line) + line.substring(team.getPrefix().length()));
+                if (!score.isScoreSet())
+                {
+                    if (i == 15)
+                    {
+                        score.setScore(1);
+                    }
+                    score.setScore(15 - i);
                 }
             }
-
+            i++;
-		//Add Elements
-		for (int i : toAdd)
-		{
-			//Insert New Line
-			String newLine = newLines.get(i);
-			GetObjectiveSide().getScore(newLine).setScore(15-i);
-			_current[i] = newLine;
-
-			if (_debug)		System.out.println("Setting: " + (15-i) + " [" + newLine + "]");
         }
     }