Improved NpcManager to work with persistent maps

Plugins/Mineplex.Core/src/mineplex/core/npc/Npc.java

@@ -1,8 +1,7 @@
 package mineplex.core.npc;
 
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreature;
 import org.bukkit.entity.Entity;
@@ -13,14 +12,16 @@ import mineplex.database.tables.records.NpcsRecord;
 
 public class Npc
 {
+	private final NpcManager _npcManager;
 	private final NpcsRecord _databaseRecord;
 	private final Location _location;
-	private UUID _uuid;
+	private LivingEntity _entity;
 	private int _failedAttempts = 0;
 	private boolean _returning = false;
 
-	public Npc(NpcsRecord databaseRecord)
+	public Npc(NpcManager npcManager, NpcsRecord databaseRecord)
 	{
+		_npcManager = npcManager;
 		_databaseRecord = databaseRecord;
 
 		_location = new Location(Bukkit.getWorld(getDatabaseRecord().getWorld()), getDatabaseRecord().getX(), getDatabaseRecord().getY(), getDatabaseRecord().getZ());
@@ -28,15 +29,18 @@ public class Npc
 
 	public void setEntity(LivingEntity entity)
 	{
-		if (entity == null)
+		if (entity != null)
-			_uuid = null;
+			getNpcManager()._npcMap.remove(entity.getUniqueId());
-		else
+
-			_uuid = entity.getUniqueId();
+		_entity = entity;
+
+		if (_entity != null)
+			getNpcManager()._npcMap.put(_entity.getUniqueId(), this);
 	}
 
-	public UUID getUuid()
+	public LivingEntity getEntity()
 	{
-		return _uuid;
+		return _entity;
 	}
 
 	public NpcsRecord getDatabaseRecord()
@@ -77,9 +81,9 @@ public class Npc
 		return location.distanceSquared(getLocation()) <= getRadius() * getRadius();
 	}
 
-	public void returnToPost(Entity entity)
+	public void returnToPost()
 	{
-		EntityCreature ec = ((CraftCreature) entity).getHandle();
+		EntityCreature ec = ((CraftCreature) _entity).getHandle();
 
 		ec.getNavigation().a(getLocation().getX(), getLocation().getY(), getLocation().getZ(), .8f);
 
@@ -99,4 +103,14 @@ public class Npc
 		EntityCreature ec = ((CraftCreature) entity).getHandle();
 		ec.getNavigation().a(entityLocation.getX(), entityLocation.getY(), entityLocation.getZ(), .8f);
 	}
+
+	public NpcManager getNpcManager()
+	{
+		return _npcManager;
+	}
+
+	public Chunk getChunk()
+	{
+		return getLocation().getChunk();
+	}
 }

Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java

@@ -2,8 +2,12 @@ package mineplex.core.npc;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -20,11 +24,13 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
@@ -43,6 +49,8 @@ import mineplex.core.database.DBPool;
 import mineplex.core.npc.command.NpcCommand;
 import mineplex.core.npc.event.NpcDamageByEntityEvent;
 import mineplex.core.npc.event.NpcInteractEntityEvent;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
 import mineplex.database.Tables;
 import mineplex.database.tables.records.NpcsRecord;
 import org.jooq.Result;
@@ -84,7 +92,8 @@ public class NpcManager extends MiniPlugin
 	}
 
 	private final Creature _creature;
-	private final Set<Npc> _npcs = new HashSet<>();
+	private final List<Npc> _npcs = new ArrayList<>();
+	final Map<UUID, Npc> _npcMap = new HashMap<>();
 	private final Set<UUID> _npcDeletingPlayers = new HashSet<>();
 
 	public NpcManager(JavaPlugin plugin, Creature creature)
@@ -113,12 +122,13 @@ public class NpcManager extends MiniPlugin
 		}
 	}
 
+	@Override
 	public void AddCommands()
 	{
 		AddCommand(new NpcCommand(this));
 	}
 
-	public void Help(Player caller, String message)
+	public void help(Player caller, String message)
 	{
 		UtilPlayer.message(caller, F.main(_moduleName, "Commands List:"));
 		UtilPlayer.message(caller, F.help("/npc add <type> [radius] [adult] [name]", "Create a new NPC.", Rank.DEVELOPER));
@@ -130,23 +140,17 @@ public class NpcManager extends MiniPlugin
 			UtilPlayer.message(caller, F.main(_moduleName, ChatColor.RED + message));
 	}
 
-	public void Help(Player caller)
+	public void help(Player caller)
 	{
-		Help(caller, null);
+		help(caller, null);
 	}
 
-	public Npc getNpcByEntityUUID(UUID uuid)
+	private Npc getNpcByEntityUUID(UUID uuid)
 	{
 		if (uuid == null)
 			return null;
 
-		for (Npc npc : _npcs)
+		return _npcMap.get(uuid);
-		{
-			if (npc.getUuid() != null && npc.getUuid().equals(uuid))
-				return npc;
-		}
-
-		return null;
 	}
 
 	public Npc getNpcByEntity(Entity entity)
@@ -162,10 +166,16 @@ public class NpcManager extends MiniPlugin
 		return getNpcByEntity(entity) != null;
 	}
 
+	public boolean isDetachedNpc(LivingEntity entity)
+	{
+		// Npc's name starts with ChatColor.RESET but it's missing from _npcMap
+		return !isNpc(entity) && entity.isCustomNameVisible() && (entity.getCustomName() == null || entity.getCustomName().startsWith(ChatColor.RESET.toString()));
+	}
+
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onEntityDamage(EntityDamageEvent event)
 	{
-		if (isNpc(event.getEntity()))
+		if (event.getEntity() instanceof LivingEntity && isNpc(event.getEntity()))
 			event.setCancelled(true);
 	}
 
@@ -209,24 +219,6 @@ public class NpcManager extends MiniPlugin
 			event.setCancelled(true);
 	}
 
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void OnChunkLoad(ChunkLoadEvent event)
-	{
-		for (Entity entity : event.getChunk().getEntities())
-		{
-			Npc npc = getNpcByEntity(entity);
-
-			if (npc != null)
-			{
-				UtilEnt.silence(entity, true);
-				UtilEnt.ghost(entity, true, false);
-
-				if (npc.getDatabaseRecord().getRadius() == 0)
-					UtilEnt.Vegetate(entity);
-			}
-		}
-	}
-
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onPlayerInteractEntity(PlayerInteractEntityEvent event)
 	{
@@ -257,7 +249,7 @@ public class NpcManager extends MiniPlugin
 		}
 	}
 
-	public Entity addNpc(Player player, EntityType entityType, double radius, boolean adult, String name) throws SQLException
+	public Entity addNpc(Player player, EntityType entityType, double radius, boolean adult, String name, String entityMeta) throws SQLException
 	{
 		try (Connection connection = DBPool.getInstance().getConnection())
 		{
@@ -282,6 +274,7 @@ public class NpcManager extends MiniPlugin
 			npcsRecord.setLeggings(leggings);
 			npcsRecord.setBoots(boots);
 			npcsRecord.setInHand(inHand);
+			npcsRecord.setEntityMeta(entityMeta);
 
 			try
 			{
@@ -292,7 +285,7 @@ public class NpcManager extends MiniPlugin
 				npcsRecord.detach();
 			}
 
-			Npc npc = new Npc(npcsRecord);
+			Npc npc = new Npc(this, npcsRecord);
 			_npcs.add(npc);
 
 			return spawnNpc(npc);
@@ -303,10 +296,19 @@ public class NpcManager extends MiniPlugin
 	{
 		LivingEntity entity = (LivingEntity) _creature.SpawnEntity(npc.getLocation(), EntityType.valueOf(npc.getDatabaseRecord().getEntityType()));
 
+		if (entity instanceof Skeleton && npc.getDatabaseRecord().getEntityMeta() != null)
+			((Skeleton) entity).setSkeletonType(Skeleton.SkeletonType.valueOf(npc.getDatabaseRecord().getEntityMeta().toUpperCase()));
+
+		entity.setCustomNameVisible(true);
 		if (npc.getDatabaseRecord().getName() != null)
 		{
-			entity.setCustomName(npc.getDatabaseRecord().getName());
+			String name = npc.getDatabaseRecord().getName();
-			entity.setCustomNameVisible(true);
+			for (ChatColor color : ChatColor.values())
+				name = name.replace("(" + color.name().toLowerCase() + ")", color.toString());
+
+			name = ChatColor.translateAlternateColorCodes('&', name);
+
+			entity.setCustomName(ChatColor.RESET + name);
 		}
 
 		entity.setCanPickupItems(false);
@@ -360,6 +362,7 @@ public class NpcManager extends MiniPlugin
 				npc.getDatabaseRecord().delete();
 
 				entity.remove();
+				_npcMap.remove(entity.getUniqueId());
 				_npcs.remove(npc);
 
 				return true;
@@ -392,7 +395,7 @@ public class NpcManager extends MiniPlugin
 				((EntityInsentient) ((CraftLivingEntity) entity).getHandle()).persistent = true;
 				UtilEnt.silence(entity, true);
 
-				if (!isNpcChunkLoaded(entity) || !(entity instanceof CraftCreature))
+				if (!entity.getLocation().getChunk().isLoaded() || !(entity instanceof CraftCreature))
 					continue;
 
 				if (!entity.isDead() && entity.isValid())
@@ -403,14 +406,14 @@ public class NpcManager extends MiniPlugin
 							armor.setDurability((short) 0);
 					}
 
-					if (npc.getFailedAttempts() >= 10)
+					if (npc.getFailedAttempts() >= 10 || npc.getDatabaseRecord().getRadius() == 0)
 					{
 						entity.teleport(npc.getLocation());
 						npc.setFailedAttempts(0);
 					}
 					else if (!npc.isInRadius(entity.getLocation()))
 					{
-						npc.returnToPost(entity);
+						npc.returnToPost();
 						npc.incrementFailedAttempts();
 					}
 					else
@@ -435,7 +438,7 @@ public class NpcManager extends MiniPlugin
 				if (npc == null)
 					continue;
 
-				if (!isNpcChunkLoaded(entity))
+				if (!entity.getLocation().getChunk().isLoaded())
 					continue;
 
 				if (!entity.isDead() && entity.isValid())
@@ -448,11 +451,6 @@ public class NpcManager extends MiniPlugin
 		}
 	}
 
-	public boolean isNpcChunkLoaded(Entity entity)
-	{
-		return entity.getWorld().isChunkLoaded(entity.getLocation().getBlockX() >> 4, entity.getLocation().getBlockZ() >> 4);
-	}
-
 	public void loadNpcs() throws SQLException
 	{
 		String serverType = _plugin.getClass().getSimpleName();
@@ -468,9 +466,11 @@ public class NpcManager extends MiniPlugin
 			{
 				record.detach();
 
-				Npc npc = new Npc(record);
+				Npc npc = new Npc(this, record);
-				spawnNpc(npc);
 				_npcs.add(npc);
+
+				if (npc.getChunk().isLoaded())
+					spawnNpc(npc);
 			}
 		}
 	}
@@ -485,6 +485,7 @@ public class NpcManager extends MiniPlugin
 					.delete(Tables.npcs)
 					.where(Tables.npcs.server.eq(serverType))
 					.execute();
+		}
 
 		for (World world : Bukkit.getWorlds())
 		{
@@ -496,6 +497,60 @@ public class NpcManager extends MiniPlugin
 		}
 
 		_npcs.clear();
+		_npcMap.clear();
 	}
+
+	@EventHandler
+	public void onUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.SEC)
+			return;
+
+		for (World world : Bukkit.getWorlds())
+		{
+			for (LivingEntity livingEntity : world.getEntitiesByClass(LivingEntity.class))
+			{
+				if (isDetachedNpc(livingEntity))
+					livingEntity.remove();
+			}
+		}
+
+		for (Npc npc : _npcs)
+		{
+			if (npc.getEntity() != null && !npc.getEntity().isValid() && npc.getChunk().isLoaded())
+				spawnNpc(npc);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onChunkLoad(ChunkLoadEvent event)
+	{
+		for (Entity entity : event.getChunk().getEntities())
+		{
+			if (entity instanceof LivingEntity)
+			{
+				Npc npc = getNpcByEntity(entity);
+				if (npc != null)
+				{
+					UtilEnt.silence(entity, true);
+					UtilEnt.ghost(entity, true, false);
+
+					if (npc.getDatabaseRecord().getRadius() == 0)
+						UtilEnt.Vegetate(entity);
+				}
+
+				if (isDetachedNpc((LivingEntity) entity))
+					entity.remove();
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onEntityDeath(EntityDeathEvent event)
+	{
+		Npc npc = getNpcByEntity(event.getEntity());
+
+		if (npc != null)
+			npc.setEntity(null);
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/npc/command/AddCommand.java

@@ -21,7 +21,7 @@ public class AddCommand extends CommandBase<NpcManager>
 	public void Execute(Player caller, String[] args)
 	{
 		if (args == null)
-			Plugin.Help(caller);
+			Plugin.help(caller);
 		else
 		{
 			EntityType type;
@@ -31,7 +31,7 @@ public class AddCommand extends CommandBase<NpcManager>
 			}
 			catch (IllegalArgumentException e)
 			{
-				Plugin.Help(caller, "Invalid entity.");
+				Plugin.help(caller, "Invalid entity.");
 
 				return;
 			}
@@ -45,7 +45,7 @@ public class AddCommand extends CommandBase<NpcManager>
 				}
 				catch (NumberFormatException e)
 				{
-					Plugin.Help(caller, "Invalid radius.");
+					Plugin.help(caller, "Invalid radius.");
 
 					return;
 				}
@@ -57,15 +57,19 @@ public class AddCommand extends CommandBase<NpcManager>
 
 			String name = null;
 			if (args.length >= 4)
-				name = ChatColor.translateAlternateColorCodes('&', args[3]);
+			{
+				name = args[3];
+				for (int i = 4; i < args.length; i++)
+					name += " " + args[i];
+			}
 
 			try
 			{
-				Plugin.addNpc(caller, type, radius, adult, name);
+				Plugin.addNpc(caller, type, radius, adult, name, null);
 			}
 			catch (SQLException e)
 			{
-				Plugin.Help(caller, "Database error.");
+				Plugin.help(caller, "Database error.");
 			}
 		}
 	}

Plugins/Mineplex.Core/src/mineplex/core/npc/command/ClearCommand.java

@@ -21,7 +21,7 @@ public class ClearCommand extends CommandBase<NpcManager>
 	public void Execute(Player caller, String[] args)
 	{
 		if (args != null)
-			Plugin.Help(caller);
+			Plugin.help(caller);
 		else
 		{
 			try
@@ -32,7 +32,7 @@ public class ClearCommand extends CommandBase<NpcManager>
 			}
 			catch (SQLException e)
 			{
-				Plugin.Help(caller, "Database error.");
+				Plugin.help(caller, "Database error.");
 			}
 		}
 	}

Plugins/Mineplex.Core/src/mineplex/core/npc/command/DeleteCommand.java

@@ -19,7 +19,7 @@ public class DeleteCommand extends CommandBase<NpcManager>
 	public void Execute(Player caller, String[] args)
 	{
 		if (args != null)
-			Plugin.Help(caller);
+			Plugin.help(caller);
 		else
 		{
 			Plugin.prepDeleteNpc(caller);

Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java

@@ -19,7 +19,7 @@ public class HomeCommand extends CommandBase<NpcManager>
 	public void Execute(Player caller, String[] args)
 	{
 		if (args != null)
-			Plugin.Help(caller);
+			Plugin.help(caller);
 		else
 		{
 			Plugin.teleportNpcsHome();

Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java

@@ -21,6 +21,6 @@ public class NpcCommand extends MultiCommandBase<NpcManager>
 	@Override
 	protected void Help(Player caller, String args[])
 	{
-		Plugin.Help(caller);
+		Plugin.help(caller);
 	}
 }

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 = -1621358205;
+	private static final long serialVersionUID = 163654509;
 
 	/**
 	 * The singleton instance of <code>Account</code>
@@ -34,7 +34,9 @@ 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.AccountCoinTransactions.accountCoinTransactions,
 			mineplex.database.tables.AccountFriend.accountFriend,
+			mineplex.database.tables.AccountGemTransactions.accountGemTransactions,
 			mineplex.database.tables.AccountInventory.accountInventory,
 			mineplex.database.tables.AccountPolls.accountPolls,
 			mineplex.database.tables.AccountPreferences.accountPreferences,

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

@@ -18,7 +18,9 @@ public class Keys {
 	// IDENTITY definitions
 	// -------------------------------------------------------------------------
 
+	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;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountInventoryRecord, java.lang.Integer> IDENTITY_accountInventory = Identities0.IDENTITY_accountInventory;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPollsRecord, java.lang.Integer> IDENTITY_accountPolls = Identities0.IDENTITY_accountPolls;
 	public static final org.jooq.Identity<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Integer> IDENTITY_accountPreferences = Identities0.IDENTITY_accountPreferences;
@@ -41,7 +43,10 @@ public class Keys {
 	// UNIQUE and PRIMARY KEY definitions
 	// -------------------------------------------------------------------------
 
+	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;
+	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord> KEY_accountGemTransactions_PRIMARY = UniqueKeys0.KEY_accountGemTransactions_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_PRIMARY = UniqueKeys0.KEY_accountInventory_PRIMARY;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_accountItemIndex = UniqueKeys0.KEY_accountInventory_accountItemIndex;
 	public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_PRIMARY = UniqueKeys0.KEY_accountPolls_PRIMARY;
@@ -74,6 +79,8 @@ public class Keys {
 	// FOREIGN KEY definitions
 	// -------------------------------------------------------------------------
 
+	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;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
 	public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1;
@@ -92,7 +99,9 @@ public class Keys {
 	// -------------------------------------------------------------------------
 
 	private static class Identities0 extends org.jooq.impl.AbstractKeys {
+		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);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountInventoryRecord, java.lang.Integer> IDENTITY_accountInventory = createIdentity(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id);
 		public static org.jooq.Identity<mineplex.database.tables.records.AccountPollsRecord, java.lang.Integer> IDENTITY_accountPolls = createIdentity(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id);
 		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);
@@ -113,7 +122,10 @@ public class Keys {
 	}
 
 	private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
+		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);
+		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord> KEY_accountGemTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountGemTransactions.accountGemTransactions, mineplex.database.tables.AccountGemTransactions.accountGemTransactions.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_PRIMARY = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.id);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountInventoryRecord> KEY_accountInventory_accountItemIndex = createUniqueKey(mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.accountId, mineplex.database.tables.AccountInventory.accountInventory.itemId);
 		public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPollsRecord> KEY_accountPolls_PRIMARY = createUniqueKey(mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.id);
@@ -144,6 +156,8 @@ public class Keys {
 	}
 
 	private static class ForeignKeys0 extends org.jooq.impl.AbstractKeys {
+		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);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId);
 		public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId);

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

@@ -13,11 +13,21 @@ package mineplex.database;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Tables {
 
+	/**
+	 * The table Account.accountCoinTransactions
+	 */
+	public static final mineplex.database.tables.AccountCoinTransactions accountCoinTransactions = mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions;
+
 	/**
 	 * The table Account.accountFriend
 	 */
 	public static final mineplex.database.tables.AccountFriend accountFriend = mineplex.database.tables.AccountFriend.accountFriend;
 
+	/**
+	 * The table Account.accountGemTransactions
+	 */
+	public static final mineplex.database.tables.AccountGemTransactions accountGemTransactions = mineplex.database.tables.AccountGemTransactions.accountGemTransactions;
+
 	/**
 	 * The table Account.accountInventory
 	 */

Plugins/Mineplex.Database/src/mineplex/database/tables/AccountCoinTransactions.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 AccountCoinTransactions extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountCoinTransactionsRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 2022908788;
+
+	/**
+	 * The singleton instance of <code>Account.accountCoinTransactions</code>
+	 */
+	public static final mineplex.database.tables.AccountCoinTransactions accountCoinTransactions = new mineplex.database.tables.AccountCoinTransactions();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.AccountCoinTransactionsRecord> getRecordType() {
+		return mineplex.database.tables.records.AccountCoinTransactionsRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.accountCoinTransactions.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.String> accounts_uuid = createField("accounts_uuid", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.accountCoinTransactions.reason</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.String> reason = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.accountCoinTransactions.coins</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> coins = createField("coins", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * Create a <code>Account.accountCoinTransactions</code> table reference
+	 */
+	public AccountCoinTransactions() {
+		this("accountCoinTransactions", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.accountCoinTransactions</code> table reference
+	 */
+	public AccountCoinTransactions(java.lang.String alias) {
+		this(alias, mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions);
+	}
+
+	private AccountCoinTransactions(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountCoinTransactionsRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private AccountCoinTransactions(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountCoinTransactionsRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.AccountCoinTransactionsRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_accountCoinTransactions;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_accountCoinTransactions_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountCoinTransactionsRecord>>asList(mineplex.database.Keys.KEY_accountCoinTransactions_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountCoinTransactionsRecord, ?>>asList(mineplex.database.Keys.accountCoinTransactions_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.AccountCoinTransactions as(java.lang.String alias) {
+		return new mineplex.database.tables.AccountCoinTransactions(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.AccountCoinTransactions rename(java.lang.String name) {
+		return new mineplex.database.tables.AccountCoinTransactions(name, null);
+	}
+}

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

@@ -11,7 +11,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountFriend extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 35533677;
+	private static final long serialVersionUID = -547231162;
 
 	/**
 	 * The singleton instance of <code>Account.accountFriend</code>
@@ -42,9 +42,9 @@ public class AccountFriend extends org.jooq.impl.TableImpl<mineplex.database.tab
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.lang.String> uuidTarget = createField("uuidTarget", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
 
 	/**
-	 * The column <code>Account.accountFriend.mutual</code>.
+	 * The column <code>Account.accountFriend.status</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.lang.Byte> mutual = createField("mutual", org.jooq.impl.SQLDataType.TINYINT, this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountFriendRecord, java.lang.String> status = createField("status", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
 
 	/**
 	 * Create a <code>Account.accountFriend</code> table reference
@@ -89,7 +89,7 @@ public class AccountFriend extends org.jooq.impl.TableImpl<mineplex.database.tab
 	 */
 	@Override
 	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord>> getKeys() {
-		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord>>asList(mineplex.database.Keys.KEY_accountFriend_PRIMARY);
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountFriendRecord>>asList(mineplex.database.Keys.KEY_accountFriend_PRIMARY, mineplex.database.Keys.KEY_accountFriend_uuidIndex);
 	}
 
 	/**

Plugins/Mineplex.Database/src/mineplex/database/tables/AccountGemTransactions.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 AccountGemTransactions extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountGemTransactionsRecord> implements java.io.Serializable, java.lang.Cloneable {
+
+	private static final long serialVersionUID = 565873060;
+
+	/**
+	 * The singleton instance of <code>Account.accountGemTransactions</code>
+	 */
+	public static final mineplex.database.tables.AccountGemTransactions accountGemTransactions = new mineplex.database.tables.AccountGemTransactions();
+
+	/**
+	 * The class holding records for this type
+	 */
+	@Override
+	public java.lang.Class<mineplex.database.tables.records.AccountGemTransactionsRecord> getRecordType() {
+		return mineplex.database.tables.records.AccountGemTransactionsRecord.class;
+	}
+
+	/**
+	 * The column <code>Account.accountGemTransactions.id</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
+
+	/**
+	 * The column <code>Account.accountGemTransactions.accounts_uuid</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.String> accounts_uuid = createField("accounts_uuid", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.accountGemTransactions.reason</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.String> reason = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
+
+	/**
+	 * The column <code>Account.accountGemTransactions.gems</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER, this, "");
+
+	/**
+	 * Create a <code>Account.accountGemTransactions</code> table reference
+	 */
+	public AccountGemTransactions() {
+		this("accountGemTransactions", null);
+	}
+
+	/**
+	 * Create an aliased <code>Account.accountGemTransactions</code> table reference
+	 */
+	public AccountGemTransactions(java.lang.String alias) {
+		this(alias, mineplex.database.tables.AccountGemTransactions.accountGemTransactions);
+	}
+
+	private AccountGemTransactions(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountGemTransactionsRecord> aliased) {
+		this(alias, aliased, null);
+	}
+
+	private AccountGemTransactions(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountGemTransactionsRecord> aliased, org.jooq.Field<?>[] parameters) {
+		super(alias, mineplex.database.Account.Account, aliased, parameters, "");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Identity<mineplex.database.tables.records.AccountGemTransactionsRecord, java.lang.Integer> getIdentity() {
+		return mineplex.database.Keys.IDENTITY_accountGemTransactions;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord> getPrimaryKey() {
+		return mineplex.database.Keys.KEY_accountGemTransactions_PRIMARY;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord>> getKeys() {
+		return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountGemTransactionsRecord>>asList(mineplex.database.Keys.KEY_accountGemTransactions_PRIMARY);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, ?>> getReferences() {
+		return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountGemTransactionsRecord, ?>>asList(mineplex.database.Keys.accountGemTransactions_ibfk_1);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public mineplex.database.tables.AccountGemTransactions as(java.lang.String alias) {
+		return new mineplex.database.tables.AccountGemTransactions(alias, this);
+	}
+
+	/**
+	 * Rename this table
+	 */
+	public mineplex.database.tables.AccountGemTransactions rename(java.lang.String name) {
+		return new mineplex.database.tables.AccountGemTransactions(name, null);
+	}
+}

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

@@ -11,7 +11,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class AccountPreferences extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = 203359538;
+	private static final long serialVersionUID = -780380646;
 
 	/**
 	 * The singleton instance of <code>Account.accountPreferences</code>
@@ -91,6 +91,11 @@ public class AccountPreferences extends org.jooq.impl.TableImpl<mineplex.databas
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Byte> ignoreVelocity = createField("ignoreVelocity", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
 
+	/**
+	 * The column <code>Account.accountPreferences.pendingFriendRequests</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountPreferencesRecord, java.lang.Byte> pendingFriendRequests = createField("pendingFriendRequests", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
+
 	/**
 	 * Create a <code>Account.accountPreferences</code> table reference
 	 */

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 = -555476915;
+	private static final long serialVersionUID = -1971089065;
 
 	/**
 	 * The singleton instance of <code>Account.accounts</code>
@@ -44,7 +44,12 @@ public class Accounts extends org.jooq.impl.TableImpl<mineplex.database.tables.r
 	/**
 	 * The column <code>Account.accounts.gems</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> gems = createField("gems", org.jooq.impl.SQLDataType.INTEGER, this, "");
+	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.coins</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.lang.Integer> coins = createField("coins", org.jooq.impl.SQLDataType.INTEGER.defaulted(true), this, "");
 
 	/**
 	 * The column <code>Account.accounts.donorRank</code>.
@@ -64,7 +69,7 @@ public class Accounts extends org.jooq.impl.TableImpl<mineplex.database.tables.r
 	/**
 	 * The column <code>Account.accounts.rankExpire</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.lang.String> rankExpire = createField("rankExpire", org.jooq.impl.SQLDataType.CLOB.length(16777215), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.AccountsRecord, java.sql.Timestamp> rankExpire = createField("rankExpire", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
 
 	/**
 	 * The column <code>Account.accounts.lastLogin</code>.

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

@@ -11,7 +11,7 @@ package mineplex.database.tables;
 @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Npcs extends org.jooq.impl.TableImpl<mineplex.database.tables.records.NpcsRecord> implements java.io.Serializable, java.lang.Cloneable {
 
-	private static final long serialVersionUID = -1308334886;
+	private static final long serialVersionUID = -1554338732;
 
 	/**
 	 * The singleton instance of <code>Account.npcs</code>
@@ -71,6 +71,11 @@ public class Npcs extends org.jooq.impl.TableImpl<mineplex.database.tables.recor
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> entityType = createField("entityType", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, "");
 
+	/**
+	 * The column <code>Account.npcs.entityMeta</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> entityMeta = createField("entityMeta", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+
 	/**
 	 * The column <code>Account.npcs.adult</code>.
 	 */
@@ -79,27 +84,27 @@ public class Npcs extends org.jooq.impl.TableImpl<mineplex.database.tables.recor
 	/**
 	 * The column <code>Account.npcs.helmet</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> helmet = createField("helmet", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> helmet = createField("helmet", org.jooq.impl.SQLDataType.CLOB.length(65535), this, "");
 
 	/**
 	 * The column <code>Account.npcs.chestplate</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> chestplate = createField("chestplate", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> chestplate = createField("chestplate", org.jooq.impl.SQLDataType.CLOB.length(65535), this, "");
 
 	/**
 	 * The column <code>Account.npcs.leggings</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> leggings = createField("leggings", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> leggings = createField("leggings", org.jooq.impl.SQLDataType.CLOB.length(65535), this, "");
 
 	/**
 	 * The column <code>Account.npcs.boots</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> boots = createField("boots", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> boots = createField("boots", org.jooq.impl.SQLDataType.CLOB.length(65535), this, "");
 
 	/**
 	 * The column <code>Account.npcs.inHand</code>.
 	 */
-	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> inHand = createField("inHand", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.String> inHand = createField("inHand", org.jooq.impl.SQLDataType.CLOB.length(65535), this, "");
 
 	/**
 	 * Create a <code>Account.npcs</code> table reference

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountCoinTransactionsRecord.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 AccountCoinTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountCoinTransactionsRecord> 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 = -1674238317;
+
+	/**
+	 * Setter for <code>Account.accountCoinTransactions.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountCoinTransactions.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 */
+	public void setAccounts_uuid(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountCoinTransactions.accounts_uuid</code>.
+	 */
+	public java.lang.String getAccounts_uuid() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.accountCoinTransactions.reason</code>.
+	 */
+	public void setReason(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountCoinTransactions.reason</code>.
+	 */
+	public java.lang.String getReason() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.accountCoinTransactions.coins</code>.
+	 */
+	public void setCoins(java.lang.Integer value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountCoinTransactions.coins</code>.
+	 */
+	public java.lang.Integer getCoins() {
+		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.AccountCoinTransactions.accountCoinTransactions.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.accounts_uuid;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.reason;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field4() {
+		return mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions.coins;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getAccounts_uuid();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getReason();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value4() {
+		return getCoins();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountCoinTransactionsRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountCoinTransactionsRecord value2(java.lang.String value) {
+		setAccounts_uuid(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountCoinTransactionsRecord value3(java.lang.String value) {
+		setReason(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountCoinTransactionsRecord value4(java.lang.Integer value) {
+		setCoins(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountCoinTransactionsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached AccountCoinTransactionsRecord
+	 */
+	public AccountCoinTransactionsRecord() {
+		super(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions);
+	}
+
+	/**
+	 * Create a detached, initialised AccountCoinTransactionsRecord
+	 */
+	public AccountCoinTransactionsRecord(java.lang.Integer id, java.lang.String accounts_uuid, java.lang.String reason, java.lang.Integer coins) {
+		super(mineplex.database.tables.AccountCoinTransactions.accountCoinTransactions);
+
+		setValue(0, id);
+		setValue(1, accounts_uuid);
+		setValue(2, reason);
+		setValue(3, coins);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountFriendRecord.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 AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> {
+public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountFriendRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String> {
 
-	private static final long serialVersionUID = -437854439;
+	private static final long serialVersionUID = -1139709892;
 
 	/**
 	 * Setter for <code>Account.accountFriend.id</code>.
@@ -56,17 +56,17 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	}
 
 	/**
-	 * Setter for <code>Account.accountFriend.mutual</code>.
+	 * Setter for <code>Account.accountFriend.status</code>.
 	 */
-	public void setMutual(java.lang.Byte value) {
+	public void setStatus(java.lang.String value) {
 		setValue(3, value);
 	}
 
 	/**
-	 * Getter for <code>Account.accountFriend.mutual</code>.
+	 * Getter for <code>Account.accountFriend.status</code>.
 	 */
-	public java.lang.Byte getMutual() {
+	public java.lang.String getStatus() {
-		return (java.lang.Byte) getValue(3);
+		return (java.lang.String) getValue(3);
 	}
 
 	// -------------------------------------------------------------------------
@@ -89,7 +89,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> fieldsRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String> fieldsRow() {
 		return (org.jooq.Row4) super.fieldsRow();
 	}
 
@@ -97,7 +97,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte> valuesRow() {
+	public org.jooq.Row4<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String> valuesRow() {
 		return (org.jooq.Row4) super.valuesRow();
 	}
 
@@ -129,8 +129,8 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field4() {
+	public org.jooq.Field<java.lang.String> field4() {
-		return mineplex.database.tables.AccountFriend.accountFriend.mutual;
+		return mineplex.database.tables.AccountFriend.accountFriend.status;
 	}
 
 	/**
@@ -161,8 +161,8 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value4() {
+	public java.lang.String value4() {
-		return getMutual();
+		return getStatus();
 	}
 
 	/**
@@ -196,8 +196,8 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountFriendRecord value4(java.lang.Byte value) {
+	public AccountFriendRecord value4(java.lang.String value) {
-		setMutual(value);
+		setStatus(value);
 		return this;
 	}
 
@@ -205,7 +205,7 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountFriendRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Byte value4) {
+	public AccountFriendRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4) {
 		return this;
 	}
 
@@ -223,12 +223,12 @@ public class AccountFriendRecord extends org.jooq.impl.UpdatableRecordImpl<minep
 	/**
 	 * Create a detached, initialised AccountFriendRecord
 	 */
-	public AccountFriendRecord(java.lang.Integer id, java.lang.String uuidSource, java.lang.String uuidTarget, java.lang.Byte mutual) {
+	public AccountFriendRecord(java.lang.Integer id, java.lang.String uuidSource, java.lang.String uuidTarget, java.lang.String status) {
 		super(mineplex.database.tables.AccountFriend.accountFriend);
 
 		setValue(0, id);
 		setValue(1, uuidSource);
 		setValue(2, uuidTarget);
-		setValue(3, mutual);
+		setValue(3, status);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountGemTransactionsRecord.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 AccountGemTransactionsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountGemTransactionsRecord> 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 = 1444170773;
+
+	/**
+	 * Setter for <code>Account.accountGemTransactions.id</code>.
+	 */
+	public void setId(java.lang.Integer value) {
+		setValue(0, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountGemTransactions.id</code>.
+	 */
+	public java.lang.Integer getId() {
+		return (java.lang.Integer) getValue(0);
+	}
+
+	/**
+	 * Setter for <code>Account.accountGemTransactions.accounts_uuid</code>.
+	 */
+	public void setAccounts_uuid(java.lang.String value) {
+		setValue(1, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountGemTransactions.accounts_uuid</code>.
+	 */
+	public java.lang.String getAccounts_uuid() {
+		return (java.lang.String) getValue(1);
+	}
+
+	/**
+	 * Setter for <code>Account.accountGemTransactions.reason</code>.
+	 */
+	public void setReason(java.lang.String value) {
+		setValue(2, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountGemTransactions.reason</code>.
+	 */
+	public java.lang.String getReason() {
+		return (java.lang.String) getValue(2);
+	}
+
+	/**
+	 * Setter for <code>Account.accountGemTransactions.gems</code>.
+	 */
+	public void setGems(java.lang.Integer value) {
+		setValue(3, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountGemTransactions.gems</code>.
+	 */
+	public java.lang.Integer getGems() {
+		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.AccountGemTransactions.accountGemTransactions.id;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field2() {
+		return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.accounts_uuid;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field3() {
+		return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.reason;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Integer> field4() {
+		return mineplex.database.tables.AccountGemTransactions.accountGemTransactions.gems;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value1() {
+		return getId();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value2() {
+		return getAccounts_uuid();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value3() {
+		return getReason();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Integer value4() {
+		return getGems();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountGemTransactionsRecord value1(java.lang.Integer value) {
+		setId(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountGemTransactionsRecord value2(java.lang.String value) {
+		setAccounts_uuid(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountGemTransactionsRecord value3(java.lang.String value) {
+		setReason(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountGemTransactionsRecord value4(java.lang.Integer value) {
+		setGems(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountGemTransactionsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.Integer value4) {
+		return this;
+	}
+
+	// -------------------------------------------------------------------------
+	// Constructors
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Create a detached AccountGemTransactionsRecord
+	 */
+	public AccountGemTransactionsRecord() {
+		super(mineplex.database.tables.AccountGemTransactions.accountGemTransactions);
+	}
+
+	/**
+	 * Create a detached, initialised AccountGemTransactionsRecord
+	 */
+	public AccountGemTransactionsRecord(java.lang.Integer id, java.lang.String accounts_uuid, java.lang.String reason, java.lang.Integer gems) {
+		super(mineplex.database.tables.AccountGemTransactions.accountGemTransactions);
+
+		setValue(0, id);
+		setValue(1, accounts_uuid);
+		setValue(2, reason);
+		setValue(3, gems);
+	}
+}

Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountPreferencesRecord.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 AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record13<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> {
+public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountPreferencesRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record14<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> {
 
-	private static final long serialVersionUID = 865577358;
+	private static final long serialVersionUID = 1651524548;
 
 	/**
 	 * Setter for <code>Account.accountPreferences.id</code>.
@@ -195,6 +195,20 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return (java.lang.Byte) getValue(12);
 	}
 
+	/**
+	 * Setter for <code>Account.accountPreferences.pendingFriendRequests</code>.
+	 */
+	public void setPendingFriendRequests(java.lang.Byte value) {
+		setValue(13, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accountPreferences.pendingFriendRequests</code>.
+	 */
+	public java.lang.Byte getPendingFriendRequests() {
+		return (java.lang.Byte) getValue(13);
+	}
+
 	// -------------------------------------------------------------------------
 	// Primary key information
 	// -------------------------------------------------------------------------
@@ -208,23 +222,23 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	}
 
 	// -------------------------------------------------------------------------
-	// Record13 type implementation
+	// Record14 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row13<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> fieldsRow() {
+	public org.jooq.Row14<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> fieldsRow() {
-		return (org.jooq.Row13) super.fieldsRow();
+		return (org.jooq.Row14) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row13<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> valuesRow() {
+	public org.jooq.Row14<java.lang.Integer, java.lang.String, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte, java.lang.Byte> valuesRow() {
-		return (org.jooq.Row13) super.valuesRow();
+		return (org.jooq.Row14) super.valuesRow();
 	}
 
 	/**
@@ -331,6 +345,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return mineplex.database.tables.AccountPreferences.accountPreferences.ignoreVelocity;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Byte> field14() {
+		return mineplex.database.tables.AccountPreferences.accountPreferences.pendingFriendRequests;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -435,6 +457,14 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		return getIgnoreVelocity();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Byte value14() {
+		return getPendingFriendRequests();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -556,7 +586,16 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountPreferencesRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Byte value3, java.lang.Byte value4, java.lang.Byte value5, java.lang.Byte value6, java.lang.Byte value7, java.lang.Byte value8, java.lang.Byte value9, java.lang.Byte value10, java.lang.Byte value11, java.lang.Byte value12, java.lang.Byte value13) {
+	public AccountPreferencesRecord value14(java.lang.Byte value) {
+		setPendingFriendRequests(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountPreferencesRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.Byte value3, java.lang.Byte value4, java.lang.Byte value5, java.lang.Byte value6, java.lang.Byte value7, java.lang.Byte value8, java.lang.Byte value9, java.lang.Byte value10, java.lang.Byte value11, java.lang.Byte value12, java.lang.Byte value13, java.lang.Byte value14) {
 		return this;
 	}
 
@@ -574,7 +613,7 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 	/**
 	 * Create a detached, initialised AccountPreferencesRecord
 	 */
-	public AccountPreferencesRecord(java.lang.Integer id, java.lang.String uuid, java.lang.Byte filterChat, java.lang.Byte invisibility, java.lang.Byte games, java.lang.Byte visibility, java.lang.Byte friendChat, java.lang.Byte privateMessaging, java.lang.Byte showChat, java.lang.Byte partyRequests, java.lang.Byte forcefield, java.lang.Byte showMacReports, java.lang.Byte ignoreVelocity) {
+	public AccountPreferencesRecord(java.lang.Integer id, java.lang.String uuid, java.lang.Byte filterChat, java.lang.Byte invisibility, java.lang.Byte games, java.lang.Byte visibility, java.lang.Byte friendChat, java.lang.Byte privateMessaging, java.lang.Byte showChat, java.lang.Byte partyRequests, java.lang.Byte forcefield, java.lang.Byte showMacReports, java.lang.Byte ignoreVelocity, java.lang.Byte pendingFriendRequests) {
 		super(mineplex.database.tables.AccountPreferences.accountPreferences);
 
 		setValue(0, id);
@@ -590,5 +629,6 @@ public class AccountPreferencesRecord extends org.jooq.impl.UpdatableRecordImpl<
 		setValue(10, forcefield);
 		setValue(11, showMacReports);
 		setValue(12, ignoreVelocity);
+		setValue(13, pendingFriendRequests);
 	}
 }

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.Record10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, 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.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> {
 
-	private static final long serialVersionUID = 1437085324;
+	private static final long serialVersionUID = -1996366804;
 
 	/**
 	 * Setter for <code>Account.accounts.id</code>.
@@ -69,88 +69,102 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 		return (java.lang.Integer) getValue(3);
 	}
 
+	/**
+	 * Setter for <code>Account.accounts.coins</code>.
+	 */
+	public void setCoins(java.lang.Integer value) {
+		setValue(4, value);
+	}
+
+	/**
+	 * Getter for <code>Account.accounts.coins</code>.
+	 */
+	public java.lang.Integer getCoins() {
+		return (java.lang.Integer) getValue(4);
+	}
+
 	/**
 	 * Setter for <code>Account.accounts.donorRank</code>.
 	 */
 	public void setDonorRank(java.lang.String value) {
-		setValue(4, value);
+		setValue(5, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.donorRank</code>.
 	 */
 	public java.lang.String getDonorRank() {
-		return (java.lang.String) getValue(4);
+		return (java.lang.String) getValue(5);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rank</code>.
 	 */
 	public void setRank(java.lang.String value) {
-		setValue(5, value);
+		setValue(6, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rank</code>.
 	 */
 	public java.lang.String getRank() {
-		return (java.lang.String) getValue(5);
+		return (java.lang.String) getValue(6);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rankPerm</code>.
 	 */
 	public void setRankPerm(java.lang.Byte value) {
-		setValue(6, value);
+		setValue(7, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rankPerm</code>.
 	 */
 	public java.lang.Byte getRankPerm() {
-		return (java.lang.Byte) getValue(6);
+		return (java.lang.Byte) getValue(7);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.rankExpire</code>.
 	 */
-	public void setRankExpire(java.lang.String value) {
+	public void setRankExpire(java.sql.Timestamp value) {
-		setValue(7, value);
+		setValue(8, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.rankExpire</code>.
 	 */
-	public java.lang.String getRankExpire() {
+	public java.sql.Timestamp getRankExpire() {
-		return (java.lang.String) getValue(7);
+		return (java.sql.Timestamp) getValue(8);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.lastLogin</code>.
 	 */
 	public void setLastLogin(java.sql.Timestamp value) {
-		setValue(8, value);
+		setValue(9, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.lastLogin</code>.
 	 */
 	public java.sql.Timestamp getLastLogin() {
-		return (java.sql.Timestamp) getValue(8);
+		return (java.sql.Timestamp) getValue(9);
 	}
 
 	/**
 	 * Setter for <code>Account.accounts.totalPlayTime</code>.
 	 */
 	public void setTotalPlayTime(java.lang.String value) {
-		setValue(9, value);
+		setValue(10, value);
 	}
 
 	/**
 	 * Getter for <code>Account.accounts.totalPlayTime</code>.
 	 */
 	public java.lang.String getTotalPlayTime() {
-		return (java.lang.String) getValue(9);
+		return (java.lang.String) getValue(10);
 	}
 
 	// -------------------------------------------------------------------------
@@ -166,23 +180,23 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	}
 
 	// -------------------------------------------------------------------------
-	// Record10 type implementation
+	// Record11 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.sql.Timestamp, java.lang.String> fieldsRow() {
+	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() {
-		return (org.jooq.Row10) super.fieldsRow();
+		return (org.jooq.Row11) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row10<java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.String, java.sql.Timestamp, java.lang.String> valuesRow() {
+	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() {
-		return (org.jooq.Row10) super.valuesRow();
+		return (org.jooq.Row11) super.valuesRow();
 	}
 
 	/**
@@ -221,8 +235,8 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field5() {
+	public org.jooq.Field<java.lang.Integer> field5() {
-		return mineplex.database.tables.Accounts.accounts.donorRank;
+		return mineplex.database.tables.Accounts.accounts.coins;
 	}
 
 	/**
@@ -230,6 +244,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public org.jooq.Field<java.lang.String> field6() {
+		return mineplex.database.tables.Accounts.accounts.donorRank;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.String> field7() {
 		return mineplex.database.tables.Accounts.accounts.rank;
 	}
 
@@ -237,7 +259,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Byte> field7() {
+	public org.jooq.Field<java.lang.Byte> field8() {
 		return mineplex.database.tables.Accounts.accounts.rankPerm;
 	}
 
@@ -245,7 +267,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field8() {
+	public org.jooq.Field<java.sql.Timestamp> field9() {
 		return mineplex.database.tables.Accounts.accounts.rankExpire;
 	}
 
@@ -253,7 +275,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.lastLogin;
 	}
 
@@ -261,7 +283,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field10() {
+	public org.jooq.Field<java.lang.String> field11() {
 		return mineplex.database.tables.Accounts.accounts.totalPlayTime;
 	}
 
@@ -301,8 +323,8 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value5() {
+	public java.lang.Integer value5() {
-		return getDonorRank();
+		return getCoins();
 	}
 
 	/**
@@ -310,6 +332,14 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public java.lang.String value6() {
+		return getDonorRank();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.String value7() {
 		return getRank();
 	}
 
@@ -317,7 +347,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Byte value7() {
+	public java.lang.Byte value8() {
 		return getRankPerm();
 	}
 
@@ -325,7 +355,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value8() {
+	public java.sql.Timestamp value9() {
 		return getRankExpire();
 	}
 
@@ -333,7 +363,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.sql.Timestamp value9() {
+	public java.sql.Timestamp value10() {
 		return getLastLogin();
 	}
 
@@ -341,7 +371,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value10() {
+	public java.lang.String value11() {
 		return getTotalPlayTime();
 	}
 
@@ -385,8 +415,8 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value5(java.lang.String value) {
+	public AccountsRecord value5(java.lang.Integer value) {
-		setDonorRank(value);
+		setCoins(value);
 		return this;
 	}
 
@@ -395,6 +425,15 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 */
 	@Override
 	public AccountsRecord value6(java.lang.String value) {
+		setDonorRank(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public AccountsRecord value7(java.lang.String value) {
 		setRank(value);
 		return this;
 	}
@@ -403,7 +442,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value7(java.lang.Byte value) {
+	public AccountsRecord value8(java.lang.Byte value) {
 		setRankPerm(value);
 		return this;
 	}
@@ -412,7 +451,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value8(java.lang.String value) {
+	public AccountsRecord value9(java.sql.Timestamp value) {
 		setRankExpire(value);
 		return this;
 	}
@@ -421,7 +460,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) {
 		setLastLogin(value);
 		return this;
 	}
@@ -430,7 +469,7 @@ public class AccountsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.d
 	 * {@inheritDoc}
 	 */
 	@Override
-	public AccountsRecord value10(java.lang.String value) {
+	public AccountsRecord value11(java.lang.String value) {
 		setTotalPlayTime(value);
 		return this;
 	}
@@ -439,7 +478,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.String value5, java.lang.String value6, java.lang.Byte value7, java.lang.String value8, java.sql.Timestamp value9, java.lang.String value10) {
+	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) {
 		return this;
 	}
 
@@ -457,18 +496,19 @@ 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.String donorRank, java.lang.String rank, java.lang.Byte rankPerm, java.lang.String 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 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, donorRank);
+		setValue(4, coins);
-		setValue(5, rank);
+		setValue(5, donorRank);
-		setValue(6, rankPerm);
+		setValue(6, rank);
-		setValue(7, rankExpire);
+		setValue(7, rankPerm);
-		setValue(8, lastLogin);
+		setValue(8, rankExpire);
-		setValue(9, totalPlayTime);
+		setValue(9, lastLogin);
+		setValue(10, totalPlayTime);
 	}
 }

Plugins/Mineplex.Database/src/mineplex/database/tables/records/NpcsRecord.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 NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.NpcsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record15<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> {
+public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.NpcsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record16<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> {
 
-	private static final long serialVersionUID = -202208690;
+	private static final long serialVersionUID = -1872308957;
 
 	/**
 	 * Setter for <code>Account.npcs.id</code>.
@@ -139,88 +139,102 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 		return (java.lang.String) getValue(8);
 	}
 
+	/**
+	 * Setter for <code>Account.npcs.entityMeta</code>.
+	 */
+	public void setEntityMeta(java.lang.String value) {
+		setValue(9, value);
+	}
+
+	/**
+	 * Getter for <code>Account.npcs.entityMeta</code>.
+	 */
+	public java.lang.String getEntityMeta() {
+		return (java.lang.String) getValue(9);
+	}
+
 	/**
 	 * Setter for <code>Account.npcs.adult</code>.
 	 */
 	public void setAdult(java.lang.Boolean value) {
-		setValue(9, value);
+		setValue(10, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.adult</code>.
 	 */
 	public java.lang.Boolean getAdult() {
-		return (java.lang.Boolean) getValue(9);
+		return (java.lang.Boolean) getValue(10);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.helmet</code>.
 	 */
 	public void setHelmet(java.lang.String value) {
-		setValue(10, value);
+		setValue(11, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.helmet</code>.
 	 */
 	public java.lang.String getHelmet() {
-		return (java.lang.String) getValue(10);
+		return (java.lang.String) getValue(11);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.chestplate</code>.
 	 */
 	public void setChestplate(java.lang.String value) {
-		setValue(11, value);
+		setValue(12, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.chestplate</code>.
 	 */
 	public java.lang.String getChestplate() {
-		return (java.lang.String) getValue(11);
+		return (java.lang.String) getValue(12);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.leggings</code>.
 	 */
 	public void setLeggings(java.lang.String value) {
-		setValue(12, value);
+		setValue(13, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.leggings</code>.
 	 */
 	public java.lang.String getLeggings() {
-		return (java.lang.String) getValue(12);
+		return (java.lang.String) getValue(13);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.boots</code>.
 	 */
 	public void setBoots(java.lang.String value) {
-		setValue(13, value);
+		setValue(14, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.boots</code>.
 	 */
 	public java.lang.String getBoots() {
-		return (java.lang.String) getValue(13);
+		return (java.lang.String) getValue(14);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.inHand</code>.
 	 */
 	public void setInHand(java.lang.String value) {
-		setValue(14, value);
+		setValue(15, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.inHand</code>.
 	 */
 	public java.lang.String getInHand() {
-		return (java.lang.String) getValue(14);
+		return (java.lang.String) getValue(15);
 	}
 
 	// -------------------------------------------------------------------------
@@ -236,23 +250,23 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	}
 
 	// -------------------------------------------------------------------------
-	// Record15 type implementation
+	// Record16 type implementation
 	// -------------------------------------------------------------------------
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row15<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> fieldsRow() {
+	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> fieldsRow() {
-		return (org.jooq.Row15) super.fieldsRow();
+		return (org.jooq.Row16) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row15<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> valuesRow() {
+	public org.jooq.Row16<java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.Double, java.lang.String, java.lang.String, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String> valuesRow() {
-		return (org.jooq.Row15) super.valuesRow();
+		return (org.jooq.Row16) super.valuesRow();
 	}
 
 	/**
@@ -331,7 +345,15 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Boolean> field10() {
+	public org.jooq.Field<java.lang.String> field10() {
+		return mineplex.database.tables.Npcs.npcs.entityMeta;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Boolean> field11() {
 		return mineplex.database.tables.Npcs.npcs.adult;
 	}
 
@@ -339,7 +361,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field11() {
+	public org.jooq.Field<java.lang.String> field12() {
 		return mineplex.database.tables.Npcs.npcs.helmet;
 	}
 
@@ -347,7 +369,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field12() {
+	public org.jooq.Field<java.lang.String> field13() {
 		return mineplex.database.tables.Npcs.npcs.chestplate;
 	}
 
@@ -355,7 +377,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field13() {
+	public org.jooq.Field<java.lang.String> field14() {
 		return mineplex.database.tables.Npcs.npcs.leggings;
 	}
 
@@ -363,7 +385,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field14() {
+	public org.jooq.Field<java.lang.String> field15() {
 		return mineplex.database.tables.Npcs.npcs.boots;
 	}
 
@@ -371,7 +393,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field15() {
+	public org.jooq.Field<java.lang.String> field16() {
 		return mineplex.database.tables.Npcs.npcs.inHand;
 	}
 
@@ -451,7 +473,15 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Boolean value10() {
+	public java.lang.String value10() {
+		return getEntityMeta();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Boolean value11() {
 		return getAdult();
 	}
 
@@ -459,7 +489,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value11() {
+	public java.lang.String value12() {
 		return getHelmet();
 	}
 
@@ -467,7 +497,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value12() {
+	public java.lang.String value13() {
 		return getChestplate();
 	}
 
@@ -475,7 +505,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value13() {
+	public java.lang.String value14() {
 		return getLeggings();
 	}
 
@@ -483,7 +513,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value14() {
+	public java.lang.String value15() {
 		return getBoots();
 	}
 
@@ -491,7 +521,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value15() {
+	public java.lang.String value16() {
 		return getInHand();
 	}
 
@@ -580,7 +610,16 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value10(java.lang.Boolean value) {
+	public NpcsRecord value10(java.lang.String value) {
+		setEntityMeta(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public NpcsRecord value11(java.lang.Boolean value) {
 		setAdult(value);
 		return this;
 	}
@@ -589,7 +628,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value11(java.lang.String value) {
+	public NpcsRecord value12(java.lang.String value) {
 		setHelmet(value);
 		return this;
 	}
@@ -598,7 +637,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value12(java.lang.String value) {
+	public NpcsRecord value13(java.lang.String value) {
 		setChestplate(value);
 		return this;
 	}
@@ -607,7 +646,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value13(java.lang.String value) {
+	public NpcsRecord value14(java.lang.String value) {
 		setLeggings(value);
 		return this;
 	}
@@ -616,7 +655,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value14(java.lang.String value) {
+	public NpcsRecord value15(java.lang.String value) {
 		setBoots(value);
 		return this;
 	}
@@ -625,7 +664,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value15(java.lang.String value) {
+	public NpcsRecord value16(java.lang.String value) {
 		setInHand(value);
 		return this;
 	}
@@ -634,7 +673,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.Double value5, java.lang.Double value6, java.lang.Double value7, java.lang.Double value8, java.lang.String value9, java.lang.Boolean value10, java.lang.String value11, java.lang.String value12, java.lang.String value13, java.lang.String value14, java.lang.String value15) {
+	public NpcsRecord values(java.lang.Integer value1, java.lang.String value2, java.lang.String value3, java.lang.String value4, java.lang.Double value5, java.lang.Double value6, java.lang.Double value7, java.lang.Double value8, java.lang.String value9, java.lang.String value10, java.lang.Boolean value11, java.lang.String value12, java.lang.String value13, java.lang.String value14, java.lang.String value15, java.lang.String value16) {
 		return this;
 	}
 
@@ -652,7 +691,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	/**
 	 * Create a detached, initialised NpcsRecord
 	 */
-	public NpcsRecord(java.lang.Integer id, java.lang.String server, java.lang.String name, java.lang.String world, java.lang.Double x, java.lang.Double y, java.lang.Double z, java.lang.Double radius, java.lang.String entityType, java.lang.Boolean adult, java.lang.String helmet, java.lang.String chestplate, java.lang.String leggings, java.lang.String boots, java.lang.String inHand) {
+	public NpcsRecord(java.lang.Integer id, java.lang.String server, java.lang.String name, java.lang.String world, java.lang.Double x, java.lang.Double y, java.lang.Double z, java.lang.Double radius, java.lang.String entityType, java.lang.String entityMeta, java.lang.Boolean adult, java.lang.String helmet, java.lang.String chestplate, java.lang.String leggings, java.lang.String boots, java.lang.String inHand) {
 		super(mineplex.database.tables.Npcs.npcs);
 
 		setValue(0, id);
@@ -664,11 +703,12 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 		setValue(6, z);
 		setValue(7, radius);
 		setValue(8, entityType);
-		setValue(9, adult);
+		setValue(9, entityMeta);
-		setValue(10, helmet);
+		setValue(10, adult);
-		setValue(11, chestplate);
+		setValue(11, helmet);
-		setValue(12, leggings);
+		setValue(12, chestplate);
-		setValue(13, boots);
+		setValue(13, leggings);
-		setValue(14, inHand);
+		setValue(14, boots);
+		setValue(15, inHand);
 	}
 }

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

@@ -19,7 +19,7 @@ public class NpcProtectListener implements Listener
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void CustomDamage(CustomDamageEvent event)
 	{
-    	if (event.GetDamageeEntity() != null && _npcManager.getNpcByEntityUUID(event.GetDamageeEntity().getUniqueId()) != null)
+    	if (event.GetDamageeEntity() != null && _npcManager.getNpcByEntity(event.GetDamageeEntity()) != null)
     		event.SetCancelled("NPC");
 	}
 }