Add pitch and yaw to npcs

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

@@ -27,7 +27,7 @@ public class Npc
 		_npcManager = npcManager;
 		_databaseRecord = databaseRecord;
 
-		_location = new Location(Bukkit.getWorld(getDatabaseRecord().getWorld()), getDatabaseRecord().getX(), getDatabaseRecord().getY(), getDatabaseRecord().getZ());
+		_location = new Location(Bukkit.getWorld(getDatabaseRecord().getWorld()), getDatabaseRecord().getX(), getDatabaseRecord().getY(), getDatabaseRecord().getZ(), Float.parseFloat(getDatabaseRecord().getYaw().toString()), Float.parseFloat(getDatabaseRecord().getPitch().toString()));
 
 		if (getDatabaseRecord().getInfo() == null)
 			_info = null;

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

@@ -264,6 +264,8 @@ public class NpcManager extends MiniPlugin
 			npcsRecord.setX(player.getLocation().getX());
 			npcsRecord.setY(player.getLocation().getY());
 			npcsRecord.setZ(player.getLocation().getZ());
+			npcsRecord.setYaw((double)player.getEyeLocation().getYaw());
+			npcsRecord.setPitch((double)player.getEyeLocation().getPitch());
 			npcsRecord.setRadius(radius);
 			npcsRecord.setEntityType(entityType.name());
 			npcsRecord.setAdult(adult);
@@ -422,8 +424,6 @@ public class NpcManager extends MiniPlugin
 					if (npc.getFailedAttempts() >= 10 || npc.getDatabaseRecord().getRadius() == 0)
 					{
 						Location location = npc.getLocation();
-						location.setPitch(entity.getLocation().getPitch());
-						location.setYaw(entity.getLocation().getYaw());
 						entity.teleport(location);
 						entity.setVelocity(new Vector(0, 0, 0));
 						npc.setFailedAttempts(0);
@@ -461,8 +461,6 @@ public class NpcManager extends MiniPlugin
 				if (!entity.isDead() && entity.isValid())
 				{
 					Location location = npc.getLocation();
-					location.setPitch(entity.getLocation().getPitch());
-					location.setYaw(entity.getLocation().getYaw());
 					entity.teleport(location);
 					entity.setVelocity(new Vector(0, 0, 0));
 

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

@@ -66,6 +66,16 @@ public class Npcs extends org.jooq.impl.TableImpl<mineplex.database.tables.recor
 	 */
 	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.Double> z = createField("z", org.jooq.impl.SQLDataType.FLOAT.nullable(false), this, "");
 	
+	/**
+	 * The column <code>Account.npcs.yaw</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.Double> yaw = createField("yaw", org.jooq.impl.SQLDataType.FLOAT.nullable(false).defaulted(true), this, "");
+	
+	/**
+	 * The column <code>Account.npcs.pitch</code>.
+	 */
+	public final org.jooq.TableField<mineplex.database.tables.records.NpcsRecord, java.lang.Double> pitch = createField("pitch", org.jooq.impl.SQLDataType.FLOAT.nullable(false).defaulted(true), this, "");
+
 	/**
 	 * The column <code>Account.npcs.radius</code>.
 	 */

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

@@ -14,7 +14,7 @@ package mineplex.database.tables.records;
 	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.Record19<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, java.lang.String, java.lang.Double, java.lang.Integer> {
+public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.NpcsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record21<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.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, java.lang.String, java.lang.Double, java.lang.Integer> {
 
 	private static final long serialVersionUID = -112578515;
 
@@ -116,172 +116,200 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 		return (java.lang.Double) getValue(6);
 	}
 	
+	/**
+	 * Setter for <code>Account.npcs.yaw</code>.
+	 */
+	public void setYaw(java.lang.Double value) {
+		setValue(7, value);
+	}
+
+	/**
+	 * Getter for <code>Account.npcs.yaw</code>.
+	 */
+	public java.lang.Double getYaw() {
+		return (java.lang.Double) getValue(7);
+	}
+	
+	/**
+	 * Setter for <code>Account.npcs.pitch</code>.
+	 */
+	public void setPitch(java.lang.Double value) {
+		setValue(8, value);
+	}
+
+	/**
+	 * Getter for <code>Account.npcs.pitch</code>.
+	 */
+	public java.lang.Double getPitch() {
+		return (java.lang.Double) getValue(8);
+	}
+
 	/**
 	 * Setter for <code>Account.npcs.radius</code>.
 	 */
 	public void setRadius(java.lang.Double value) {
-		setValue(7, value);
+		setValue(9, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.radius</code>.
 	 */
 	public java.lang.Double getRadius() {
-		return (java.lang.Double) getValue(7);
+		return (java.lang.Double) getValue(9);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.entityType</code>.
 	 */
 	public void setEntityType(java.lang.String value) {
-		setValue(8, value);
+		setValue(10, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.entityType</code>.
 	 */
 	public java.lang.String getEntityType() {
-		return (java.lang.String) getValue(8);
+		return (java.lang.String) getValue(10);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.entityMeta</code>.
 	 */
 	public void setEntityMeta(java.lang.String value) {
-		setValue(9, value);
+		setValue(11, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.entityMeta</code>.
 	 */
 	public java.lang.String getEntityMeta() {
-		return (java.lang.String) getValue(9);
+		return (java.lang.String) getValue(11);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.adult</code>.
 	 */
 	public void setAdult(java.lang.Boolean value) {
-		setValue(10, value);
+		setValue(12, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.adult</code>.
 	 */
 	public java.lang.Boolean getAdult() {
-		return (java.lang.Boolean) getValue(10);
+		return (java.lang.Boolean) getValue(12);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.helmet</code>.
 	 */
 	public void setHelmet(java.lang.String value) {
-		setValue(11, value);
+		setValue(13, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.helmet</code>.
 	 */
 	public java.lang.String getHelmet() {
-		return (java.lang.String) getValue(11);
+		return (java.lang.String) getValue(13);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.chestplate</code>.
 	 */
 	public void setChestplate(java.lang.String value) {
-		setValue(12, value);
+		setValue(14, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.chestplate</code>.
 	 */
 	public java.lang.String getChestplate() {
-		return (java.lang.String) getValue(12);
+		return (java.lang.String) getValue(14);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.leggings</code>.
 	 */
 	public void setLeggings(java.lang.String value) {
-		setValue(13, value);
+		setValue(15, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.leggings</code>.
 	 */
 	public java.lang.String getLeggings() {
-		return (java.lang.String) getValue(13);
+		return (java.lang.String) getValue(15);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.boots</code>.
 	 */
 	public void setBoots(java.lang.String value) {
-		setValue(14, value);
+		setValue(16, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.boots</code>.
 	 */
 	public java.lang.String getBoots() {
-		return (java.lang.String) getValue(14);
+		return (java.lang.String) getValue(16);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.inHand</code>.
 	 */
 	public void setInHand(java.lang.String value) {
-		setValue(15, value);
+		setValue(17, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.inHand</code>.
 	 */
 	public java.lang.String getInHand() {
-		return (java.lang.String) getValue(15);
+		return (java.lang.String) getValue(17);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.info</code>.
 	 */
 	public void setInfo(java.lang.String value) {
-		setValue(16, value);
+		setValue(18, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.info</code>.
 	 */
 	public java.lang.String getInfo() {
-		return (java.lang.String) getValue(16);
+		return (java.lang.String) getValue(18);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.infoRadius</code>.
 	 */
 	public void setInfoRadius(java.lang.Double value) {
-		setValue(17, value);
+		setValue(19, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.infoRadius</code>.
 	 */
 	public java.lang.Double getInfoRadius() {
-		return (java.lang.Double) getValue(17);
+		return (java.lang.Double) getValue(19);
 	}
 
 	/**
 	 * Setter for <code>Account.npcs.infoDelay</code>.
 	 */
 	public void setInfoDelay(java.lang.Integer value) {
-		setValue(18, value);
+		setValue(20, value);
 	}
 
 	/**
 	 * Getter for <code>Account.npcs.infoDelay</code>.
 	 */
 	public java.lang.Integer getInfoDelay() {
-		return (java.lang.Integer) getValue(18);
+		return (java.lang.Integer) getValue(20);
 	}
 
 	// -------------------------------------------------------------------------
@@ -304,16 +332,16 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row19<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, java.lang.String, java.lang.Double, java.lang.Integer> fieldsRow() {
+	public org.jooq.Row21<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.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, java.lang.String, java.lang.Double, java.lang.Integer> fieldsRow() {
-		return (org.jooq.Row19) super.fieldsRow();
+		return (org.jooq.Row21) super.fieldsRow();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Row19<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, java.lang.String, java.lang.Double, java.lang.Integer> valuesRow() {
+	public org.jooq.Row21<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.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, java.lang.String, java.lang.Double, java.lang.Integer> valuesRow() {
-		return (org.jooq.Row19) super.valuesRow();
+		return (org.jooq.Row21) super.valuesRow();
 	}
 
 	/**
@@ -377,6 +405,22 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 */
 	@Override
 	public org.jooq.Field<java.lang.Double> field8() {
+		return mineplex.database.tables.Npcs.npcs.yaw;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Double> field9() {
+		return mineplex.database.tables.Npcs.npcs.pitch;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public org.jooq.Field<java.lang.Double> field10() {
 		return mineplex.database.tables.Npcs.npcs.radius;
 	}
 
@@ -384,7 +428,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field9() {
+	public org.jooq.Field<java.lang.String> field11() {
 		return mineplex.database.tables.Npcs.npcs.entityType;
 	}
 
@@ -392,7 +436,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field10() {
+	public org.jooq.Field<java.lang.String> field12() {
 		return mineplex.database.tables.Npcs.npcs.entityMeta;
 	}
 
@@ -400,7 +444,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Boolean> field11() {
+	public org.jooq.Field<java.lang.Boolean> field13() {
 		return mineplex.database.tables.Npcs.npcs.adult;
 	}
 
@@ -408,7 +452,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> field14() {
 		return mineplex.database.tables.Npcs.npcs.helmet;
 	}
 
@@ -416,7 +460,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> field15() {
 		return mineplex.database.tables.Npcs.npcs.chestplate;
 	}
 
@@ -424,7 +468,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> field16() {
 		return mineplex.database.tables.Npcs.npcs.leggings;
 	}
 
@@ -432,7 +476,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> field17() {
 		return mineplex.database.tables.Npcs.npcs.boots;
 	}
 
@@ -440,7 +484,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field16() {
+	public org.jooq.Field<java.lang.String> field18() {
 		return mineplex.database.tables.Npcs.npcs.inHand;
 	}
 
@@ -448,7 +492,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.String> field17() {
+	public org.jooq.Field<java.lang.String> field19() {
 		return mineplex.database.tables.Npcs.npcs.info;
 	}
 
@@ -456,7 +500,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Double> field18() {
+	public org.jooq.Field<java.lang.Double> field20() {
 		return mineplex.database.tables.Npcs.npcs.infoRadius;
 	}
 
@@ -464,7 +508,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public org.jooq.Field<java.lang.Integer> field19() {
+	public org.jooq.Field<java.lang.Integer> field21() {
 		return mineplex.database.tables.Npcs.npcs.infoDelay;
 	}
 
@@ -529,6 +573,22 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 */
 	@Override
 	public java.lang.Double value8() {
+		return getYaw();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Double value9() {
+		return getPitch();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public java.lang.Double value10() {
 		return getRadius();
 	}
 
@@ -536,7 +596,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value9() {
+	public java.lang.String value11() {
 		return getEntityType();
 	}
 
@@ -544,7 +604,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value10() {
+	public java.lang.String value12() {
 		return getEntityMeta();
 	}
 
@@ -552,7 +612,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Boolean value11() {
+	public java.lang.Boolean value13() {
 		return getAdult();
 	}
 
@@ -560,7 +620,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value12() {
+	public java.lang.String value14() {
 		return getHelmet();
 	}
 
@@ -568,7 +628,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value13() {
+	public java.lang.String value15() {
 		return getChestplate();
 	}
 
@@ -576,7 +636,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value14() {
+	public java.lang.String value16() {
 		return getLeggings();
 	}
 
@@ -584,7 +644,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value15() {
+	public java.lang.String value17() {
 		return getBoots();
 	}
 
@@ -592,7 +652,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value16() {
+	public java.lang.String value18() {
 		return getInHand();
 	}
 
@@ -600,7 +660,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.String value17() {
+	public java.lang.String value19() {
 		return getInfo();
 	}
 
@@ -608,7 +668,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Double value18() {
+	public java.lang.Double value20() {
 		return getInfoRadius();
 	}
 
@@ -616,7 +676,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public java.lang.Integer value19() {
+	public java.lang.Integer value21() {
 		return getInfoDelay();
 	}
 
@@ -688,6 +748,24 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 */
 	@Override
 	public NpcsRecord value8(java.lang.Double value) {
+		setYaw(value);
+		return this;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public NpcsRecord value9(java.lang.Double value) {
+		setPitch(value);
+		return this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public NpcsRecord value10(java.lang.Double value) {
 		setRadius(value);
 		return this;
 	}
@@ -696,7 +774,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value9(java.lang.String value) {
+	public NpcsRecord value11(java.lang.String value) {
 		setEntityType(value);
 		return this;
 	}
@@ -705,7 +783,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value10(java.lang.String value) {
+	public NpcsRecord value12(java.lang.String value) {
 		setEntityMeta(value);
 		return this;
 	}
@@ -714,7 +792,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value11(java.lang.Boolean value) {
+	public NpcsRecord value13(java.lang.Boolean value) {
 		setAdult(value);
 		return this;
 	}
@@ -723,7 +801,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value12(java.lang.String value) {
+	public NpcsRecord value14(java.lang.String value) {
 		setHelmet(value);
 		return this;
 	}
@@ -732,7 +810,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value13(java.lang.String value) {
+	public NpcsRecord value15(java.lang.String value) {
 		setChestplate(value);
 		return this;
 	}
@@ -741,7 +819,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value14(java.lang.String value) {
+	public NpcsRecord value16(java.lang.String value) {
 		setLeggings(value);
 		return this;
 	}
@@ -750,7 +828,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value15(java.lang.String value) {
+	public NpcsRecord value17(java.lang.String value) {
 		setBoots(value);
 		return this;
 	}
@@ -759,7 +837,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value16(java.lang.String value) {
+	public NpcsRecord value18(java.lang.String value) {
 		setInHand(value);
 		return this;
 	}
@@ -768,7 +846,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value17(java.lang.String value) {
+	public NpcsRecord value19(java.lang.String value) {
 		setInfo(value);
 		return this;
 	}
@@ -777,7 +855,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value18(java.lang.Double value) {
+	public NpcsRecord value20(java.lang.Double value) {
 		setInfoRadius(value);
 		return this;
 	}
@@ -786,7 +864,7 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 	 * {@inheritDoc}
 	 */
 	@Override
-	public NpcsRecord value19(java.lang.Integer value) {
+	public NpcsRecord value21(java.lang.Integer value) {
 		setInfoDelay(value);
 		return this;
 	}
@@ -795,7 +873,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.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, java.lang.String value17, java.lang.Double value18, java.lang.Integer value19) {
+	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.Double value9, java.lang.Double value10, java.lang.String value11, java.lang.String value12, java.lang.Boolean value13, java.lang.String value14, java.lang.String value15, java.lang.String value16, java.lang.String value17, java.lang.String value18, java.lang.String value19, java.lang.Double value20, java.lang.Integer value21) {
 		return this;
 	}
 
@@ -813,7 +891,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.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, java.lang.String info, java.lang.Double infoRadius, java.lang.Integer infoDelay) {
+	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 yaw, java.lang.Double pitch, 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, java.lang.String info, java.lang.Double infoRadius, java.lang.Integer infoDelay) {
 		super(mineplex.database.tables.Npcs.npcs);
 
 		setValue(0, id);
@@ -823,17 +901,19 @@ public class NpcsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.datab
 		setValue(4, x);
 		setValue(5, y);
 		setValue(6, z);
-		setValue(7, radius);
+		setValue(7, yaw);
-		setValue(8, entityType);
+		setValue(8, pitch);
-		setValue(9, entityMeta);
+		setValue(9, radius);
-		setValue(10, adult);
+		setValue(10, entityType);
-		setValue(11, helmet);
+		setValue(11, entityMeta);
-		setValue(12, chestplate);
+		setValue(12, adult);
-		setValue(13, leggings);
+		setValue(13, helmet);
-		setValue(14, boots);
+		setValue(14, chestplate);
-		setValue(15, inHand);
+		setValue(15, leggings);
-		setValue(16, info);
+		setValue(16, boots);
-		setValue(17, infoRadius);
+		setValue(17, inHand);
-		setValue(18, infoDelay);
+		setValue(18, info);
+		setValue(19, infoRadius);
+		setValue(20, infoDelay);
 	}
 }