diff --git a/dist/pom.xml b/dist/pom.xml
index a2bea5dc8..d12a9a268 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.citizensnpcs</groupId>
         <artifactId>citizens-parent</artifactId> 
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.24-SNAPSHOT</version>
     </parent>
     <artifactId>citizens</artifactId>
     <packaging>pom</packaging>
@@ -67,13 +67,13 @@
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency>
+        </dependency> 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>citizens-v1_13_R1</artifactId>
+            <artifactId>citizens-v1_13_R2</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency>
+        </dependency> 
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/main/pom.xml b/main/pom.xml
index 05187ed54..28ba9d2f2 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -6,14 +6,14 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
 	<artifactId>citizens-main</artifactId> 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.13-R0.1-SNAPSHOT</craftbukkit.version>
-		<citizensapi.version>2.0.23-SNAPSHOT</citizensapi.version>
+		<craftbukkit.version>1.13.1-R0.1-SNAPSHOT</craftbukkit.version>
+		<citizensapi.version>${project.version}</citizensapi.version>
 		<vault.version>1.5.4</vault.version>
 		<powermock.version>1.4.12</powermock.version>
 		<bstats.version>1.2</bstats.version>
diff --git a/pom.xml b/pom.xml
index 0bb54947b..0644c66de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,14 +7,14 @@
     <packaging>pom</packaging>
     <groupId>net.citizensnpcs</groupId>
     <artifactId>citizens-parent</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.24-SNAPSHOT</version>
     <modules>
         <module>main</module>  
         <module>v1_8_R3</module>
         <module>v1_10_R1</module>
         <module>v1_11_R1</module>
         <module>v1_12_R1</module>
-        <module>v1_13_R1</module>
+        <module>v1_13_R2</module>
         <module>dist</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml
index f8d28a8e7..a371b7910 100644
--- a/v1_10_R1/pom.xml
+++ b/v1_10_R1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
 	<artifactId>citizens-v1_10_R1</artifactId> 
 
diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml
index 2b0591877..3330c6de4 100644
--- a/v1_11_R1/pom.xml
+++ b/v1_11_R1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
 	<artifactId>citizens-v1_11_R1</artifactId> 
 
diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
index 81790ecff..eb0a0c394 100644
--- a/v1_12_R1/pom.xml
+++ b/v1_12_R1/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
 	<artifactId>citizens-v1_12_R1</artifactId> 
 
diff --git a/v1_13_R1/pom.xml b/v1_13_R2/pom.xml
similarity index 92%
rename from v1_13_R1/pom.xml
rename to v1_13_R2/pom.xml
index de91d92fb..3766ca401 100644
--- a/v1_13_R1/pom.xml
+++ b/v1_13_R2/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
-	<artifactId>citizens-v1_13_R1</artifactId> 
+	<artifactId>citizens-v1_13_R2</artifactId> 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.13-R0.1-SNAPSHOT</craftbukkit.version>
+		<craftbukkit.version>1.13.1-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
 	<repositories> 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
index 3bdec7538..b8d729e34 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BatController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBat;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftBat;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Bat;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityBat;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityBat;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class BatController extends MobEntityController {
     public BatController() {
@@ -66,7 +66,7 @@ public class BatController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
index d37d54ade..cf53890ba 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/BlazeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBlaze;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftBlaze;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Blaze;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityBlaze;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityBlaze;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class BlazeController extends MobEntityController {
     public BlazeController() {
@@ -65,7 +65,7 @@ public class BlazeController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
index a11db0869..68a38d63a 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CaveSpiderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCaveSpider;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCaveSpider;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.CaveSpider;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityCaveSpider;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityCaveSpider;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class CaveSpiderController extends MobEntityController {
     public CaveSpiderController() {
@@ -83,7 +83,7 @@ public class CaveSpiderController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
index d30df5f57..4c479e95d 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ChickenController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftChicken;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftChicken;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Chicken;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityChicken;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityChicken;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ChickenController extends MobEntityController {
     public ChickenController() {
@@ -96,7 +96,7 @@ public class ChickenController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
index 69eec263e..7662729d5 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CodController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCod;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCod;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Cod;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityCod;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityCod;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class CodController extends MobEntityController {
     public CodController() {
@@ -87,7 +87,7 @@ public class CodController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
index 07b095c61..5037bf59f 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCow;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCow;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Cow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityCow;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityCow;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class CowController extends MobEntityController {
     public CowController() {
@@ -95,7 +95,7 @@ public class CowController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
index 1f8d2c6d3..4fb7b5daf 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/CreeperController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftCreeper;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftCreeper;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Creeper;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityCreeper;
-import net.minecraft.server.v1_13_R1.EntityLightning;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityCreeper;
+import net.minecraft.server.v1_13_R2.EntityLightning;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class CreeperController extends MobEntityController {
     public CreeperController() {
@@ -85,7 +85,7 @@ public class CreeperController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
index ff9afb384..036dea5b7 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DolphinController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDolphin;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDolphin;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Dolphin;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityDolphin;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityDolphin;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class DolphinController extends MobEntityController {
     public DolphinController() {
@@ -86,7 +86,7 @@ public class DolphinController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
index 33a707626..5efcab6b0 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/DrownedController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDrowned;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDrowned;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Drowned;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityDrowned;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityDrowned;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class DrownedController extends MobEntityController {
     public DrownedController() {
@@ -85,7 +85,7 @@ public class DrownedController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
index 0a1ffcbc5..65786b7c1 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EnderDragonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderDragon;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderDragon;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityEnderDragon;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityEnderDragon;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EnderDragonController extends MobEntityController {
     public EnderDragonController() {
@@ -65,7 +65,7 @@ public class EnderDragonController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
index 447b83e4b..52d6480c0 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderman;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderman;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Enderman;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityEnderman;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityEnderman;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EndermanController extends MobEntityController {
     public EndermanController() {
@@ -83,7 +83,7 @@ public class EndermanController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
index 6e9aa1980..b21fa7746 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EndermiteController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEndermite;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEndermite;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Endermite;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityEndermite;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityEndermite;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EndermiteController extends MobEntityController {
     public EndermiteController() {
@@ -83,7 +83,7 @@ public class EndermiteController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
index d24844e89..d67c15377 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EntityHumanNPC.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -10,8 +10,8 @@ import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
@@ -28,15 +28,15 @@ import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.MetadataStore;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Inventory;
-import net.citizensnpcs.nms.v1_13_R1.network.EmptyNetHandler;
-import net.citizensnpcs.nms.v1_13_R1.network.EmptyNetworkManager;
-import net.citizensnpcs.nms.v1_13_R1.network.EmptySocket;
-import net.citizensnpcs.nms.v1_13_R1.util.EmptyAdvancementDataPlayer;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerJump;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerLook;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerNavigation;
+import net.citizensnpcs.nms.v1_13_R2.network.EmptyNetHandler;
+import net.citizensnpcs.nms.v1_13_R2.network.EmptyNetworkManager;
+import net.citizensnpcs.nms.v1_13_R2.network.EmptySocket;
+import net.citizensnpcs.nms.v1_13_R2.util.EmptyAdvancementDataPlayer;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerControllerJump;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerControllerLook;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerControllerMove;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerNavigation;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.npc.skin.SkinPacketTracker;
@@ -44,29 +44,29 @@ import net.citizensnpcs.npc.skin.SkinnableEntity;
 import net.citizensnpcs.trait.Gravity;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.AttributeInstance;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ChatComponentText;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EnumGamemode;
-import net.minecraft.server.v1_13_R1.EnumItemSlot;
-import net.minecraft.server.v1_13_R1.EnumProtocolDirection;
-import net.minecraft.server.v1_13_R1.GenericAttributes;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.IChatBaseComponent;
-import net.minecraft.server.v1_13_R1.MathHelper;
-import net.minecraft.server.v1_13_R1.MinecraftServer;
-import net.minecraft.server.v1_13_R1.NavigationAbstract;
-import net.minecraft.server.v1_13_R1.NetworkManager;
-import net.minecraft.server.v1_13_R1.Packet;
-import net.minecraft.server.v1_13_R1.PacketPlayOutEntityEquipment;
-import net.minecraft.server.v1_13_R1.PacketPlayOutEntityHeadRotation;
-import net.minecraft.server.v1_13_R1.PathType;
-import net.minecraft.server.v1_13_R1.PlayerInteractManager;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.AttributeInstance;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ChatComponentText;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.EnumGamemode;
+import net.minecraft.server.v1_13_R2.EnumItemSlot;
+import net.minecraft.server.v1_13_R2.EnumProtocolDirection;
+import net.minecraft.server.v1_13_R2.GenericAttributes;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.IChatBaseComponent;
+import net.minecraft.server.v1_13_R2.MathHelper;
+import net.minecraft.server.v1_13_R2.MinecraftServer;
+import net.minecraft.server.v1_13_R2.NavigationAbstract;
+import net.minecraft.server.v1_13_R2.NetworkManager;
+import net.minecraft.server.v1_13_R2.Packet;
+import net.minecraft.server.v1_13_R2.PacketPlayOutEntityEquipment;
+import net.minecraft.server.v1_13_R2.PacketPlayOutEntityHeadRotation;
+import net.minecraft.server.v1_13_R2.PathType;
+import net.minecraft.server.v1_13_R2.PlayerInteractManager;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity {
     private final Map<PathType, Float> bz = Maps.newEnumMap(PathType.class);
@@ -135,7 +135,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     }
 
     @Override
-    public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+    public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
         // this method is called by both the entities involved - cancelling
         // it will not stop the NPC from moving.
         super.collide(entity);
@@ -551,7 +551,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         }
     }
 
-    private static Field ADVANCEMENT_DATA_PLAYER = NMS.getField(EntityPlayer.class, "cg");
+    private static Field ADVANCEMENT_DATA_PLAYER = NMS.getField(EntityPlayer.class, "cf");
     private static final float EPSILON = 0.005F;
     private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0);
     static {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
index 50a4bfa6a..76fe3eeb1 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/EvokerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEvoker;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEvoker;
 import org.bukkit.entity.Evoker;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityEvoker;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityEvoker;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EvokerController extends MobEntityController {
     public EvokerController() {
@@ -69,7 +69,7 @@ public class EvokerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
index dac1f4cbc..7599fe9a7 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GhastController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGhast;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftGhast;
 import org.bukkit.entity.Ghast;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityGhast;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityGhast;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class GhastController extends MobEntityController {
     public GhastController() {
@@ -46,7 +46,7 @@ public class GhastController extends MobEntityController {
         }
 
         @Override
-        public boolean cO() {
+        public boolean isRiptiding() {
             return npc != null;
         }
 
@@ -56,7 +56,7 @@ public class GhastController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
index f8b378060..288f04a31 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GiantController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGiant;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftGiant;
 import org.bukkit.entity.Giant;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityGiantZombie;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityGiantZombie;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class GiantController extends MobEntityController {
     public GiantController() {
@@ -69,7 +69,7 @@ public class GiantController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
index f5012a1dc..03e31fc09 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftGuardian;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftGuardian;
 import org.bukkit.entity.Guardian;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityGuardian;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityGuardian;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class GuardianController extends MobEntityController {
     public GuardianController() {
@@ -69,7 +69,7 @@ public class GuardianController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
index eff520926..fceb61bff 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/GuardianElderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftElderGuardian;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftElderGuardian;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.ElderGuardian;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityGuardianElder;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityGuardianElder;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class GuardianElderController extends MobEntityController {
     public GuardianElderController() {
@@ -69,7 +69,7 @@ public class GuardianElderController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
index 6aadabcd7..26f332f9a 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftHorse;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHorse;
 import org.bukkit.entity.Horse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHorse;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHorse;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class HorseController extends MobEntityController {
     public HorseController() {
@@ -90,7 +90,7 @@ public class HorseController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
index 06e5ce0fb..1ddd021ab 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseDonkeyController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDonkey;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDonkey;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Donkey;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHorseDonkey;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHorseDonkey;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class HorseDonkeyController extends MobEntityController {
     public HorseDonkeyController() {
@@ -90,7 +90,7 @@ public class HorseDonkeyController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
index d29ef6966..6eb14224b 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseMuleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMule;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMule;
 import org.bukkit.entity.Mule;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHorseMule;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHorseMule;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class HorseMuleController extends MobEntityController {
     public HorseMuleController() {
@@ -90,7 +90,7 @@ public class HorseMuleController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
index c876737d7..29f54a695 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseSkeletonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSkeletonHorse;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSkeletonHorse;
 import org.bukkit.entity.SkeletonHorse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHorseSkeleton;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHorseSkeleton;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class HorseSkeletonController extends MobEntityController {
     public HorseSkeletonController() {
@@ -91,7 +91,7 @@ public class HorseSkeletonController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
index f0cc82d86..2ae13e275 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HorseZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftZombieHorse;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftZombieHorse;
 import org.bukkit.entity.ZombieHorse;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHorseZombie;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHorseZombie;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class HorseZombieController extends MobEntityController {
     public HorseZombieController() {
@@ -91,7 +91,7 @@ public class HorseZombieController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
similarity index 96%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
index 4c3cfadd9..eed5ddbe2 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/HumanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -6,7 +6,7 @@ import java.util.regex.Pattern;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Scoreboard;
@@ -22,8 +22,8 @@ import net.citizensnpcs.npc.AbstractEntityController;
 import net.citizensnpcs.npc.skin.Skin;
 import net.citizensnpcs.npc.skin.SkinnableEntity;
 import net.citizensnpcs.util.NMS;
-import net.minecraft.server.v1_13_R1.PlayerInteractManager;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.PlayerInteractManager;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
index 704227e65..8229468db 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IllusionerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftIllusioner;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftIllusioner;
 import org.bukkit.entity.Illusioner;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityIllagerIllusioner;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityIllagerIllusioner;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class IllusionerController extends MobEntityController {
     public IllusionerController() {
@@ -69,7 +69,7 @@ public class IllusionerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
index 32b9da995..0b15690ef 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/IronGolemController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftIronGolem;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftIronGolem;
 import org.bukkit.entity.IronGolem;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityIronGolem;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityIronGolem;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class IronGolemController extends MobEntityController {
     public IronGolemController() {
@@ -69,7 +69,7 @@ public class IronGolemController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
index 796889af3..73fdd6bdf 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/LlamaController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLlama;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLlama;
 import org.bukkit.entity.Llama;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.HorseModifiers;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityLlama;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityLlama;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class LlamaController extends MobEntityController {
     public LlamaController() {
@@ -90,7 +90,7 @@ public class LlamaController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
index 8a12793f0..dc37872d4 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MagmaCubeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMagmaCube;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMagmaCube;
 import org.bukkit.entity.MagmaCube;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerControllerMove;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityMagmaCube;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityMagmaCube;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MagmaCubeController extends MobEntityController {
     public MagmaCubeController() {
@@ -81,7 +81,7 @@ public class MagmaCubeController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
similarity index 84%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
index b1c778466..f4ca93bfc 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MobEntityController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
@@ -1,18 +1,18 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
 import org.bukkit.entity.Entity;
 
 import com.google.common.collect.Maps;
 
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.AbstractEntityController;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.World;
 
 public abstract class MobEntityController extends AbstractEntityController {
     private final Constructor<?> constructor;
@@ -24,7 +24,7 @@ public abstract class MobEntityController extends AbstractEntityController {
 
     @Override
     protected Entity createEntity(Location at, NPC npc) {
-        net.minecraft.server.v1_13_R1.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(),
+        net.minecraft.server.v1_13_R2.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(),
                 npc);
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
 
@@ -37,9 +37,9 @@ public abstract class MobEntityController extends AbstractEntityController {
         return entity.getBukkitEntity();
     }
 
-    private net.minecraft.server.v1_13_R1.Entity createEntityFromClass(Object... args) {
+    private net.minecraft.server.v1_13_R2.Entity createEntityFromClass(Object... args) {
         try {
-            return (net.minecraft.server.v1_13_R1.Entity) constructor.newInstance(args);
+            return (net.minecraft.server.v1_13_R2.Entity) constructor.newInstance(args);
         } catch (Exception ex) {
             ex.printStackTrace();
             return null;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
index 805c6a65b..b46a39351 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/MushroomCowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMushroomCow;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMushroomCow;
 import org.bukkit.entity.MushroomCow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMushroomCow;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMushroomCow;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MushroomCowController extends MobEntityController {
 
@@ -81,7 +81,7 @@ public class MushroomCowController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
index 76e97314f..ee7046a27 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/OcelotController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftOcelot;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftOcelot;
 import org.bukkit.entity.Ocelot;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityOcelot;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityOcelot;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class OcelotController extends MobEntityController {
     public OcelotController() {
@@ -82,7 +82,7 @@ public class OcelotController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
@@ -112,9 +112,9 @@ public class OcelotController extends MobEntityController {
         }
 
         @Override
-        protected void dA() {
+        protected void dz() {
             if (npc == null) {
-                super.dA();
+                super.dz();
             }
         }
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
index f4bebae2a..2e99c52a8 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ParrotController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftParrot;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftParrot;
 import org.bukkit.entity.Parrot;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityParrot;
-import net.minecraft.server.v1_13_R1.EnumHand;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityParrot;
+import net.minecraft.server.v1_13_R2.EnumHand;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ParrotController extends MobEntityController {
     public ParrotController() {
@@ -62,7 +62,7 @@ public class ParrotController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
index b5a39a567..6236231d4 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PhantomController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
@@ -1,29 +1,29 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPhantom;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPhantom;
 import org.bukkit.entity.Phantom;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerLook;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityPhantom;
-import net.minecraft.server.v1_13_R1.EnumDifficulty;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerLook;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityPhantom;
+import net.minecraft.server.v1_13_R2.EnumDifficulty;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PhantomController extends MobEntityController {
     public PhantomController() {
@@ -78,7 +78,7 @@ public class PhantomController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
@@ -107,9 +107,9 @@ public class PhantomController extends MobEntityController {
         }
 
         @Override
-        public boolean dr() {
+        public boolean dq() {
             if (npc == null || !npc.isProtected())
-                return super.dr();
+                return super.dq();
             return false;
         }
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
index a98942f30..ebc548eba 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPig;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPig;
 import org.bukkit.entity.Pig;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityLightning;
-import net.minecraft.server.v1_13_R1.EntityPig;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityLightning;
+import net.minecraft.server.v1_13_R2.EntityPig;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PigController extends MobEntityController {
     public PigController() {
@@ -83,7 +83,7 @@ public class PigController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
@@ -113,9 +113,9 @@ public class PigController extends MobEntityController {
         }
 
         @Override
-        public boolean di() {
+        public boolean dh() {
             // block carrot-on-a-stick behaviour
-            return npc == null ? super.di() : false;
+            return npc == null ? super.dh() : false;
         }
 
         @Override
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
index 4f469be40..1514d58a8 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PigZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPigZombie;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPigZombie;
 import org.bukkit.entity.PigZombie;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityPigZombie;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityPigZombie;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PigZombieController extends MobEntityController {
 
@@ -70,7 +70,7 @@ public class PigZombieController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
index bb5de3344..1ed7ba218 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PolarBearController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPolarBear;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPolarBear;
 import org.bukkit.entity.PolarBear;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityPolarBear;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityPolarBear;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PolarBearController extends MobEntityController {
     public PolarBearController() {
@@ -62,7 +62,7 @@ public class PolarBearController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
index a12d582a5..5d6664563 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/PufferFishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPufferFish;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPufferFish;
 import org.bukkit.entity.PufferFish;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityPufferFish;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityPufferFish;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PufferFishController extends MobEntityController {
     public PufferFishController() {
@@ -73,7 +73,7 @@ public class PufferFishController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
index d73a4fdcc..2164c30db 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/RabbitController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftRabbit;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftRabbit;
 import org.bukkit.entity.Rabbit;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.EntityRabbit;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.EntityRabbit;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class RabbitController extends MobEntityController {
     public RabbitController() {
@@ -84,7 +84,7 @@ public class RabbitController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
index 07e069563..1638b6a23 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SalmonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSalmon;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSalmon;
 import org.bukkit.entity.Salmon;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySalmon;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySalmon;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SalmonController extends MobEntityController {
     public SalmonController() {
@@ -73,7 +73,7 @@ public class SalmonController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
index db98819dd..5d38ade32 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SheepController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSheep;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSheep;
 import org.bukkit.entity.Sheep;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySheep;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySheep;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SheepController extends MobEntityController {
     public SheepController() {
@@ -80,7 +80,7 @@ public class SheepController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
index 36915eb49..e9281b725 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ShulkerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftShulker;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftShulker;
 import org.bukkit.entity.Shulker;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityAIBodyControl;
-import net.minecraft.server.v1_13_R1.EntityShulker;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityAIBodyControl;
+import net.minecraft.server.v1_13_R2.EntityShulker;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ShulkerController extends MobEntityController {
     public ShulkerController() {
@@ -72,7 +72,7 @@ public class ShulkerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
index baa459dd9..83e694326 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SilverfishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
@@ -1,25 +1,25 @@
-package net.citizensnpcs.nms.v1_13_R1.entity; import net.minecraft.server.v1_13_R1.DamageSource;
+package net.citizensnpcs.nms.v1_13_R2.entity; import net.minecraft.server.v1_13_R2.DamageSource;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSilverfish;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSilverfish;
 import org.bukkit.entity.Silverfish;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.EntitySilverfish;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.EntitySilverfish;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SilverfishController extends MobEntityController {
     public SilverfishController() {
@@ -64,7 +64,7 @@ public class SilverfishController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
index 2e4c233b1..807956373 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSkeleton;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSkeleton;
 import org.bukkit.entity.Skeleton;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySkeleton;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySkeleton;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SkeletonController extends MobEntityController {
     public SkeletonController() {
@@ -69,7 +69,7 @@ public class SkeletonController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
index c2ae637a6..a4ebc9ade 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonStrayController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftStray;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftStray;
 import org.bukkit.entity.Stray;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySkeletonStray;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySkeletonStray;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SkeletonStrayController extends MobEntityController {
     public SkeletonStrayController() {
@@ -69,7 +69,7 @@ public class SkeletonStrayController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
index bf34a834b..04563f930 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SkeletonWitherController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitherSkeleton;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWitherSkeleton;
 import org.bukkit.entity.WitherSkeleton;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySkeletonWither;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySkeletonWither;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SkeletonWitherController extends MobEntityController {
     public SkeletonWitherController() {
@@ -69,7 +69,7 @@ public class SkeletonWitherController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
index 5b4b1b885..175ac75aa 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SlimeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSlime;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSlime;
 import org.bukkit.entity.Slime;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
-import net.citizensnpcs.nms.v1_13_R1.util.PlayerControllerMove;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.PlayerControllerMove;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntitySlime;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntitySlime;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SlimeController extends MobEntityController {
     public SlimeController() {
@@ -81,7 +81,7 @@ public class SlimeController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
index 59602537a..520e268b4 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SnowmanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSnowman;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSnowman;
 import org.bukkit.entity.Snowman;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySnowman;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySnowman;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SnowmanController extends MobEntityController {
     public SnowmanController() {
@@ -71,7 +71,7 @@ public class SnowmanController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
index 5177d4b95..6626bc975 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SpiderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSpider;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSpider;
 import org.bukkit.entity.Spider;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySpider;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySpider;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SpiderController extends MobEntityController {
     public SpiderController() {
@@ -69,7 +69,7 @@ public class SpiderController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
index c8e7c34e6..8bc687120 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/SquidController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSquid;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSquid;
 import org.bukkit.entity.Squid;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntitySquid;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntitySquid;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SquidController extends MobEntityController {
     public SquidController() {
@@ -69,7 +69,7 @@ public class SquidController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
index b26833456..12a5d3139 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TropicalFishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTropicalFish;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftTropicalFish;
 import org.bukkit.entity.TropicalFish;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityTropicalFish;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityTropicalFish;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class TropicalFishController extends MobEntityController {
     public TropicalFishController() {
@@ -73,7 +73,7 @@ public class TropicalFishController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
index 2ba529ece..b1101e8f2 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/TurtleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
@@ -1,27 +1,27 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTurtle;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftTurtle;
 import org.bukkit.entity.Turtle;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityTurtle;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityTurtle;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class TurtleController extends MobEntityController {
     public TurtleController() {
@@ -73,7 +73,7 @@ public class TurtleController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
index 80f9e7297..a0e6a414f 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VexController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVex;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftVex;
 import org.bukkit.entity.Vex;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityVex;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityVex;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class VexController extends MobEntityController {
     public VexController() {
@@ -52,7 +52,7 @@ public class VexController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
index 4dcd329b8..9eeafad7c 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VillagerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
@@ -1,32 +1,32 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import java.util.List;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVillager;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftVillager;
 import org.bukkit.entity.Villager;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityLightning;
-import net.minecraft.server.v1_13_R1.EntityVillager;
-import net.minecraft.server.v1_13_R1.EnumHand;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.MerchantRecipe;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityLightning;
+import net.minecraft.server.v1_13_R2.EntityVillager;
+import net.minecraft.server.v1_13_R2.EnumHand;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.MerchantRecipe;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class VillagerController extends MobEntityController {
     public VillagerController() {
@@ -102,7 +102,7 @@ public class VillagerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
index 287dfa5ee..2f8e570ff 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/VindicatorController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVindicator;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftVindicator;
 import org.bukkit.entity.Vindicator;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityVindicator;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityVindicator;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class VindicatorController extends MobEntityController {
     public VindicatorController() {
@@ -80,7 +80,7 @@ public class VindicatorController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
index 5fe7ad251..7a4e03054 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitchController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitch;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWitch;
 import org.bukkit.entity.Witch;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityWitch;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityWitch;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class WitchController extends MobEntityController {
     public WitchController() {
@@ -69,7 +69,7 @@ public class WitchController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
index 89f1d1e04..2cfff7381 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WitherController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
@@ -1,24 +1,24 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWither;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWither;
 import org.bukkit.entity.Wither;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityWither;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityWither;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class WitherController extends MobEntityController {
     public WitherController() {
@@ -46,12 +46,7 @@ public class WitherController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cs() {
-            return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA);
-        }
-
-        @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
@@ -59,6 +54,11 @@ public class WitherController extends MobEntityController {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
 
+        @Override
+        protected SoundEffect cs() {
+            return NMSImpl.getSoundEffect(npc, super.cs(), NPC.DEATH_SOUND_METADATA);
+        }
+
         @Override
         protected SoundEffect d(DamageSource damagesource) {
             return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA);
@@ -69,6 +69,11 @@ public class WitherController extends MobEntityController {
             return npc == null ? super.d(save) : false;
         }
 
+        @Override
+        protected SoundEffect D() {
+            return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA);
+        }
+
         @Override
         public void enderTeleportTo(double d0, double d1, double d2) {
             if (npc == null) {
@@ -104,11 +109,6 @@ public class WitherController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        protected SoundEffect D() {
-            return NMSImpl.getSoundEffect(npc, super.D(), NPC.AMBIENT_SOUND_METADATA);
-        }
-
         @Override
         public CraftEntity getBukkitEntity() {
             if (npc != null && !(bukkitEntity instanceof NPCHolder))
@@ -121,6 +121,13 @@ public class WitherController extends MobEntityController {
             return npc;
         }
 
+        @Override
+        protected void I() {
+            if (npc == null) {
+                super.I();
+            }
+        }
+
         @Override
         public boolean isLeashed() {
             if (npc == null)
@@ -135,15 +142,8 @@ public class WitherController extends MobEntityController {
         }
 
         @Override
-        protected void I() {
-            if (npc == null) {
-                super.I();
-            }
-        }
-
-        @Override
-        public int m(int i) {
-            return npc == null ? super.m(i) : 0;
+        public int l(int i) {
+            return npc == null ? super.l(i) : 0;
         }
 
         @Override
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
index f5f186570..b4478d615 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/WolfController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
@@ -1,9 +1,9 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.util.Vector;
@@ -11,18 +11,18 @@ import org.bukkit.util.Vector;
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.EntityWolf;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.EntityWolf;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class WolfController extends MobEntityController {
     public WolfController() {
@@ -82,7 +82,7 @@ public class WolfController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
index 25bcc0276..b4e059a3b 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftZombie;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftZombie;
 import org.bukkit.entity.Zombie;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityZombie;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityZombie;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ZombieController extends MobEntityController {
     public ZombieController() {
@@ -69,7 +69,7 @@ public class ZombieController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
index e812eaedd..fd8e11b57 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieHuskController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftHusk;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHusk;
 import org.bukkit.entity.Husk;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityZombieHusk;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityZombieHusk;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ZombieHuskController extends MobEntityController {
     public ZombieHuskController() {
@@ -69,7 +69,7 @@ public class ZombieHuskController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
similarity index 89%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
index 0c52e8075..2cc3e4bec 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/ZombieVillagerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
@@ -1,26 +1,26 @@
-package net.citizensnpcs.nms.v1_13_R1.entity;
+package net.citizensnpcs.nms.v1_13_R2.entity;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftVillagerZombie;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftVillagerZombie;
 import org.bukkit.entity.ZombieVillager;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityZombieVillager;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityZombieVillager;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ZombieVillagerController extends MobEntityController {
     public ZombieVillagerController() {
@@ -69,7 +69,7 @@ public class ZombieVillagerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
index f18bea02e..c6e2a3564 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftAreaEffectCloud;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftAreaEffectCloud;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityAreaEffectCloud;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityAreaEffectCloud;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class AreaEffectCloudController extends MobEntityController {
     public AreaEffectCloudController() {
@@ -63,7 +63,7 @@ public class AreaEffectCloudController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java
similarity index 84%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java
index ada5c9173..e77a678eb 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ArmorStandController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ArmorStandController.java
@@ -1,9 +1,9 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArmorStand;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArmorStand;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -11,17 +11,17 @@ import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityArmorStand;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EnumHand;
-import net.minecraft.server.v1_13_R1.EnumInteractionResult;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.Vec3D;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityArmorStand;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EnumHand;
+import net.minecraft.server.v1_13_R2.EnumInteractionResult;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.Vec3D;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ArmorStandController extends MobEntityController {
     public ArmorStandController() {
@@ -79,7 +79,7 @@ public class ArmorStandController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
similarity index 85%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
index ec50d937d..57678bd1c 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/BoatController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
@@ -1,22 +1,22 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftBoat;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftBoat;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Boat;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityBoat;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityBoat;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class BoatController extends MobEntityController {
     public BoatController() {
@@ -64,7 +64,7 @@ public class BoatController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
index 6720d791a..a65fdff61 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
@@ -1,22 +1,22 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftDragonFireball;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftDragonFireball;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.DragonFireball;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityDragonFireball;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityDragonFireball;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class DragonFireballController extends MobEntityController {
     public DragonFireballController() {
@@ -55,7 +55,7 @@ public class DragonFireballController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
similarity index 87%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
index 8fe189229..276bf0e3f 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EggController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
@@ -6,17 +6,17 @@ import net.citizensnpcs.npc.AbstractEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityEgg;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.EntityEgg;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEgg;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEgg;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Egg;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
@@ -75,7 +75,7 @@ public class EggController extends AbstractEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
index 58d2b4431..45d0731f8 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityEnderCrystal;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityEnderCrystal;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderCrystal;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderCrystal;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.EnderCrystal;
 import org.bukkit.util.Vector;
 
@@ -59,7 +59,7 @@ public class EnderCrystalController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
index 52600f2a6..f937f7eb3 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderPearl;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderPearl;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.EnderPearl;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityEnderPearl;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityEnderPearl;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EnderPearlController extends MobEntityController {
     public EnderPearlController() {
@@ -54,7 +54,7 @@ public class EnderPearlController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
index 2d8428858..d0d6aa2cb 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityEnderSignal;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityEnderSignal;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEnderSignal;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEnderSignal;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.EnderSignal;
 import org.bukkit.util.Vector;
 
@@ -59,7 +59,7 @@ public class EnderSignalController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
similarity index 84%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
index 2e329bd08..a64dd4ee7 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
@@ -1,9 +1,9 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEvokerFangs;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEvokerFangs;
 import org.bukkit.entity.EvokerFangs;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -11,17 +11,17 @@ import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityEvokerFangs;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EnumHand;
-import net.minecraft.server.v1_13_R1.EnumInteractionResult;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.Vec3D;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityEvokerFangs;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EnumHand;
+import net.minecraft.server.v1_13_R2.EnumInteractionResult;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.Vec3D;
+import net.minecraft.server.v1_13_R2.World;
 
 public class EvokerFangsController extends MobEntityController {
     public EvokerFangsController() {
@@ -65,7 +65,7 @@ public class EvokerFangsController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
index ffc00232e..3b7468742 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityExperienceOrb;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityExperienceOrb;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftExperienceOrb;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftExperienceOrb;
 import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.util.Vector;
 
@@ -40,7 +40,7 @@ public class ExperienceOrbController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
index 538916c4a..8e4c000fd 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
@@ -1,13 +1,13 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFallingBlock;
-import org.bukkit.craftbukkit.v1_13_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftFallingBlock;
+import org.bukkit.craftbukkit.v1_13_R2.util.CraftMagicNumbers;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.util.Vector;
@@ -16,19 +16,19 @@ import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.AbstractEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.Block;
-import net.minecraft.server.v1_13_R1.Blocks;
-import net.minecraft.server.v1_13_R1.EntityFallingBlock;
-import net.minecraft.server.v1_13_R1.EnumMoveType;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.Block;
+import net.minecraft.server.v1_13_R2.Blocks;
+import net.minecraft.server.v1_13_R2.EntityFallingBlock;
+import net.minecraft.server.v1_13_R2.EnumMoveType;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class FallingBlockController extends AbstractEntityController {
     public FallingBlockController() {
@@ -73,7 +73,7 @@ public class FallingBlockController extends AbstractEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
index ebc9e1649..c4814db7d 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FireworkController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityFireworks;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityFireworks;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFirework;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftFirework;
 import org.bukkit.entity.Firework;
 import org.bukkit.util.Vector;
 
@@ -45,7 +45,7 @@ public class FireworkController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
index 00e05c9b0..6504ed623 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/FishingHookController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftFishHook;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftFishHook;
 import org.bukkit.entity.FishHook;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityFishingHook;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityFishingHook;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class FishingHookController extends MobEntityController {
     public FishingHookController() {
@@ -40,7 +40,7 @@ public class FishingHookController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
index 72e72483c..732f4a7ca 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
@@ -1,13 +1,13 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftItem;
-import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftItem;
+import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
 import org.bukkit.util.Vector;
@@ -20,12 +20,12 @@ import net.citizensnpcs.npc.AbstractEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityItem;
-import net.minecraft.server.v1_13_R1.ItemStack;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityItem;
+import net.minecraft.server.v1_13_R2.ItemStack;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class ItemController extends AbstractEntityController {
     public ItemController() {
@@ -64,7 +64,7 @@ public class ItemController extends AbstractEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
similarity index 88%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
index 4d776d629..f61f97f18 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
@@ -1,11 +1,11 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftItemFrame;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftItemFrame;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.util.Vector;
@@ -14,15 +14,15 @@ import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.EntityItemFrame;
-import net.minecraft.server.v1_13_R1.EnumDirection;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.EntityItemFrame;
+import net.minecraft.server.v1_13_R2.EnumDirection;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ItemFrameController extends MobEntityController {
     public ItemFrameController() {
@@ -56,7 +56,7 @@ public class ItemFrameController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
index 2e28def21..31fff89a7 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
@@ -1,22 +1,22 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLargeFireball;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLargeFireball;
 import org.bukkit.entity.LargeFireball;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityLargeFireball;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityLargeFireball;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class LargeFireballController extends MobEntityController {
     public LargeFireballController() {
@@ -41,7 +41,7 @@ public class LargeFireballController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
index 06b5482e1..3ec265d11 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LeashController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityLeash;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityLeash;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLeash;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLeash;
 import org.bukkit.entity.LeashHitch;
 import org.bukkit.util.Vector;
 
@@ -40,7 +40,7 @@ public class LeashController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
index 430cc03c8..dfe6a3e50 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
@@ -1,11 +1,11 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLlamaSpit;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLlamaSpit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LlamaSpit;
 import org.bukkit.util.Vector;
@@ -16,11 +16,11 @@ import net.citizensnpcs.npc.AbstractEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityLlama;
-import net.minecraft.server.v1_13_R1.EntityLlamaSpit;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.EntityLlama;
+import net.minecraft.server.v1_13_R2.EntityLlamaSpit;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class LlamaSpitController extends AbstractEntityController {
     public LlamaSpitController() {
@@ -70,7 +70,7 @@ public class LlamaSpitController extends AbstractEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
similarity index 85%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
index 1dc4a716c..34dbc94a3 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
@@ -1,23 +1,23 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartChest;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMinecartChest;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartChest;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartChest;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartChestController extends MobEntityController {
     public MinecartChestController() {
@@ -51,7 +51,7 @@ public class MinecartChestController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
similarity index 85%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
index 5ac6b0ff7..44424dcdd 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
@@ -1,23 +1,23 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartCommand;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMinecartCommand;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartCommandBlock;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartCommandBlock;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartCommandController extends MobEntityController {
     public MinecartCommandController() {
@@ -51,7 +51,7 @@ public class MinecartCommandController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
similarity index 85%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
index 98cfa784e..1bd22d065 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
@@ -1,23 +1,23 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartFurnace;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMinecartFurnace;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartFurnace;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartFurnace;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartFurnaceController extends MobEntityController {
     public MinecartFurnaceController() {
@@ -51,7 +51,7 @@ public class MinecartFurnaceController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
index bf2276c73..9783b1873 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartHopper;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartHopper;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartHopperController extends MobEntityController {
     public MinecartHopperController() {
@@ -47,7 +47,7 @@ public class MinecartHopperController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
similarity index 85%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
index 10d257603..1a11cfbe1 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
@@ -1,23 +1,23 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftMinecartRideable;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftMinecartRideable;
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartRideable;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartRideable;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartRideableController extends MobEntityController {
     public MinecartRideableController() {
@@ -51,7 +51,7 @@ public class MinecartRideableController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
index 308d192c1..ddabc9583 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartMobSpawner;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartMobSpawner;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartSpawnerController extends MobEntityController {
     public MinecartSpawnerController() {
@@ -47,7 +47,7 @@ public class MinecartSpawnerController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
index 157772372..7171115a2 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.entity.Minecart;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.EntityMinecartTNT;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.EntityMinecartTNT;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class MinecartTNTController extends MobEntityController {
     public MinecartTNTController() {
@@ -47,7 +47,7 @@ public class MinecartTNTController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
index 4a4e83d82..5f8debef5 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/PaintingController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityPainting;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityPainting;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPainting;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPainting;
 import org.bukkit.entity.Painting;
 import org.bukkit.util.Vector;
 
@@ -45,7 +45,7 @@ public class PaintingController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
index 46a1c0fba..1c8bcbe58 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftShulkerBullet;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftShulkerBullet;
 import org.bukkit.entity.ShulkerBullet;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityShulkerBullet;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityShulkerBullet;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ShulkerBulletController extends MobEntityController {
     public ShulkerBulletController() {
@@ -40,7 +40,7 @@ public class ShulkerBulletController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
index aa7971c27..7c40a8e1e 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSmallFireball;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSmallFireball;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntitySmallFireball;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntitySmallFireball;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SmallFireballController extends MobEntityController {
     public SmallFireballController() {
@@ -40,7 +40,7 @@ public class SmallFireballController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
index 419af17d3..fd2ec1e75 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SnowballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntitySnowball;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntitySnowball;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftSnowball;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftSnowball;
 import org.bukkit.entity.Snowball;
 import org.bukkit.util.Vector;
 
@@ -59,7 +59,7 @@ public class SnowballController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
index 4a346bebf..de7197c36 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArrow;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArrow;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntitySpectralArrow;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntitySpectralArrow;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class SpectralArrowController extends MobEntityController {
     public SpectralArrowController() {
@@ -40,7 +40,7 @@ public class SpectralArrowController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
index 435c4bb61..94c1c353f 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityTNTPrimed;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityTNTPrimed;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTNTPrimed;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftTNTPrimed;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 
@@ -45,7 +45,7 @@ public class TNTPrimedController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
index d2eec8783..c700b41e3 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftThrownExpBottle;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftThrownExpBottle;
 import org.bukkit.entity.ThrownExpBottle;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityThrownExpBottle;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityThrownExpBottle;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ThrownExpBottleController extends MobEntityController {
     public ThrownExpBottleController() {
@@ -40,7 +40,7 @@ public class ThrownExpBottleController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
similarity index 87%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
index f88a77958..8a6a860fa 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
@@ -1,22 +1,22 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftLingeringPotion;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftLingeringPotion;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityPotion;
-import net.minecraft.server.v1_13_R1.Items;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityPotion;
+import net.minecraft.server.v1_13_R2.Items;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ThrownPotionController extends MobEntityController {
     public ThrownPotionController() {
@@ -41,7 +41,7 @@ public class ThrownPotionController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
index 52c7f0a24..84257baa6 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/ThrownTridentController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftTrident;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftTrident;
 import org.bukkit.entity.Trident;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityThrownTrident;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityThrownTrident;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class ThrownTridentController extends MobEntityController {
     public ThrownTridentController() {
@@ -40,7 +40,7 @@ public class ThrownTridentController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
index 386948e69..5e8ec8fc4 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
@@ -1,21 +1,21 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftArrow;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftArrow;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Arrow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityTippedArrow;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityTippedArrow;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 public class TippedArrowController extends MobEntityController {
     public TippedArrowController() {
@@ -40,7 +40,7 @@ public class TippedArrowController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
index 851389ac8..92fa62fec 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
@@ -1,19 +1,19 @@
-package net.citizensnpcs.nms.v1_13_R1.entity.nonliving;
+package net.citizensnpcs.nms.v1_13_R2.entity.nonliving;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MobEntityController;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.EntityWitherSkull;
-import net.minecraft.server.v1_13_R1.NBTTagCompound;
-import net.minecraft.server.v1_13_R1.World;
+import net.minecraft.server.v1_13_R2.EntityWitherSkull;
+import net.minecraft.server.v1_13_R2.NBTTagCompound;
+import net.minecraft.server.v1_13_R2.World;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWitherSkull;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWitherSkull;
 import org.bukkit.entity.WitherSkull;
 import org.bukkit.util.Vector;
 
@@ -45,7 +45,7 @@ public class WitherSkullController extends MobEntityController {
         }
 
         @Override
-        public void collide(net.minecraft.server.v1_13_R1.Entity entity) {
+        public void collide(net.minecraft.server.v1_13_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyChannel.java
similarity index 97%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyChannel.java
index b72b751bb..0350a1cad 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyChannel.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyChannel.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.network;
+package net.citizensnpcs.nms.v1_13_R2.network;
 
 import java.net.SocketAddress;
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetHandler.java
similarity index 50%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetHandler.java
index 3e9c8a7f2..9d82b0f45 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetHandler.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetHandler.java
@@ -1,10 +1,10 @@
-package net.citizensnpcs.nms.v1_13_R1.network;
+package net.citizensnpcs.nms.v1_13_R2.network;
 
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.MinecraftServer;
-import net.minecraft.server.v1_13_R1.NetworkManager;
-import net.minecraft.server.v1_13_R1.Packet;
-import net.minecraft.server.v1_13_R1.PlayerConnection;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.MinecraftServer;
+import net.minecraft.server.v1_13_R2.NetworkManager;
+import net.minecraft.server.v1_13_R2.Packet;
+import net.minecraft.server.v1_13_R2.PlayerConnection;
 
 public class EmptyNetHandler extends PlayerConnection {
     public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetworkManager.java
similarity index 59%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetworkManager.java
index ee64e2336..940b516c2 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptyNetworkManager.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptyNetworkManager.java
@@ -1,10 +1,10 @@
-package net.citizensnpcs.nms.v1_13_R1.network;
+package net.citizensnpcs.nms.v1_13_R2.network;
 
 import java.io.IOException;
 
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
-import net.minecraft.server.v1_13_R1.EnumProtocolDirection;
-import net.minecraft.server.v1_13_R1.NetworkManager;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
+import net.minecraft.server.v1_13_R2.EnumProtocolDirection;
+import net.minecraft.server.v1_13_R2.NetworkManager;
 
 public class EmptyNetworkManager extends NetworkManager {
     public EmptyNetworkManager(EnumProtocolDirection flag) throws IOException {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptySocket.java
similarity index 90%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptySocket.java
index f4456e1b5..e7152f72d 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/network/EmptySocket.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/network/EmptySocket.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.network;
+package net.citizensnpcs.nms.v1_13_R2.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/BossBarTrait.java
similarity index 95%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/BossBarTrait.java
index 81b2030ce..dda40fa52 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/BossBarTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/BossBarTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import java.util.Collection;
 import java.util.List;
@@ -14,7 +14,7 @@ import com.google.common.collect.Lists;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitName;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 
 @TraitName("bossbar")
 public class BossBarTrait extends Trait {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
similarity index 99%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
index 8fe6be7c4..6639a1f07 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/Commands.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import java.util.List;
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/LlamaTrait.java
similarity index 94%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/LlamaTrait.java
index 8d7df3326..e38c33fbf 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/LlamaTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/LlamaTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.entity.Llama;
 import org.bukkit.entity.Llama.Color;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ParrotTrait.java
similarity index 94%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ParrotTrait.java
index d2509add1..eff2fa2c6 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ParrotTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ParrotTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.entity.Parrot;
 import org.bukkit.entity.Parrot.Variant;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PhantomTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PhantomTrait.java
similarity index 93%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PhantomTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PhantomTrait.java
index 20ebcb701..a6eb10405 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PhantomTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PhantomTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.entity.Phantom;
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PufferFishTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PufferFishTrait.java
similarity index 93%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PufferFishTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PufferFishTrait.java
index e81f67d25..a6ab0fab7 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/PufferFishTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/PufferFishTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.entity.PufferFish;
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ShulkerTrait.java
similarity index 92%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ShulkerTrait.java
index 81d635929..4072a529a 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/ShulkerTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/ShulkerTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.DyeColor;
 import org.bukkit.entity.Shulker;
@@ -6,7 +6,7 @@ import org.bukkit.entity.Shulker;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitName;
-import net.citizensnpcs.nms.v1_13_R1.util.NMSImpl;
+import net.citizensnpcs.nms.v1_13_R2.util.NMSImpl;
 import net.citizensnpcs.util.NMS;
 
 @TraitName("shulkertrait")
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/TropicalFishTrait.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/TropicalFishTrait.java
similarity index 96%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/TropicalFishTrait.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/TropicalFishTrait.java
index c49ada5b0..fb03e9c57 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/trait/TropicalFishTrait.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/TropicalFishTrait.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.trait;
+package net.citizensnpcs.nms.v1_13_R2.trait;
 
 import org.bukkit.DyeColor;
 import org.bukkit.entity.TropicalFish;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
similarity index 87%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
index e99976b0e..c0d604d0b 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CitizensBlockBreaker.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
@@ -1,8 +1,8 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 import net.citizensnpcs.api.ai.tree.BehaviorStatus;
@@ -11,17 +11,17 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.PlayerAnimation;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.Blocks;
-import net.minecraft.server.v1_13_R1.EnchantmentManager;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EnumItemSlot;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.ItemStack;
-import net.minecraft.server.v1_13_R1.MobEffects;
-import net.minecraft.server.v1_13_R1.TagsFluid;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.Blocks;
+import net.minecraft.server.v1_13_R2.EnchantmentManager;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.EnumItemSlot;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.ItemStack;
+import net.minecraft.server.v1_13_R2.MobEffects;
+import net.minecraft.server.v1_13_R2.TagsFluid;
 
 public class CitizensBlockBreaker extends BlockBreaker {
     private final BlockBreakerConfiguration configuration;
@@ -48,7 +48,7 @@ public class CitizensBlockBreaker extends BlockBreaker {
         return Math.pow(entity.locX - x, 2) + Math.pow(entity.locY - y, 2) + Math.pow(entity.locZ - z, 2);
     }
 
-    private net.minecraft.server.v1_13_R1.ItemStack getCurrentItem() {
+    private net.minecraft.server.v1_13_R2.ItemStack getCurrentItem() {
         return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item())
                 : entity instanceof EntityLiving ? ((EntityLiving) entity).getEquipment(EnumItemSlot.MAINHAND) : null;
     }
@@ -162,7 +162,7 @@ public class CitizensBlockBreaker extends BlockBreaker {
                 f *= f1;
             }
 
-            if (handle.a(TagsFluid.a) && !EnchantmentManager.h(handle)) {
+            if (handle.a(TagsFluid.WATER) && !EnchantmentManager.h(handle)) {
                 f /= 5.0F;
             }
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
similarity index 65%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
index f91102e11..4a1ae1d9a 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/CustomEntityRegistry.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -9,26 +9,21 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 
-import net.minecraft.server.v1_13_R1.EntityTypes;
-import net.minecraft.server.v1_13_R1.MinecraftKey;
-import net.minecraft.server.v1_13_R1.RegistryMaterials;
+import net.minecraft.server.v1_13_R2.EntityTypes;
+import net.minecraft.server.v1_13_R2.MinecraftKey;
+import net.minecraft.server.v1_13_R2.RegistryMaterials;
 
 @SuppressWarnings("rawtypes")
 public class CustomEntityRegistry extends RegistryMaterials {
     private final BiMap<MinecraftKey, EntityTypes> entities = HashBiMap.create();
     private final BiMap<EntityTypes, MinecraftKey> entityClasses = this.entities.inverse();
     private final Map<EntityTypes, Integer> entityIds = Maps.newHashMap();
-    private final RegistryMaterials<MinecraftKey, EntityTypes<?>> wrapped;
+    private final RegistryMaterials<EntityTypes<?>> wrapped;
 
-    public CustomEntityRegistry(RegistryMaterials<MinecraftKey, EntityTypes<?>> original) {
+    public CustomEntityRegistry(RegistryMaterials<EntityTypes<?>> original) {
         this.wrapped = original;
     }
 
-    @Override
-    public void a(int code, Object key, Object v) {
-        put(code, (MinecraftKey) key, (EntityTypes) v);
-    }
-
     @Override
     public int a(Object key) {
         if (entityIds.containsKey(key)) {
@@ -44,17 +39,8 @@ public class CustomEntityRegistry extends RegistryMaterials {
     }
 
     @Override
-    public MinecraftKey b(Object value) {
-        if (entityClasses.containsKey(value)) {
-            return entityClasses.get(value);
-        }
-
-        return wrapped.b((EntityTypes) value);
-    }
-
-    @Override
-    public boolean d(Object paramK) {
-        return wrapped.d((MinecraftKey) paramK);
+    public boolean c(MinecraftKey paramK) {
+        return wrapped.c(paramK);
     }
 
     public EntityTypes findType(Class<?> search) {
@@ -67,20 +53,24 @@ public class CustomEntityRegistry extends RegistryMaterials {
     }
 
     @Override
-    public EntityTypes get(Object key) {
+    public EntityTypes get(MinecraftKey key) {
         if (entities.containsKey(key)) {
             return entities.get(key);
         }
 
-        return wrapped.get((MinecraftKey) key);
+        return wrapped.get(key);
     }
 
     @Override
-    public Object getId(int paramInt) {
-        return wrapped.getId(paramInt);
+    public MinecraftKey getKey(Object value) {
+        if (entityClasses.containsKey(value)) {
+            return entityClasses.get(value);
+        }
+
+        return wrapped.getKey((EntityTypes) value);
     }
 
-    public RegistryMaterials<MinecraftKey, EntityTypes<?>> getWrapped() {
+    public RegistryMaterials<EntityTypes<?>> getWrapped() {
         return wrapped;
     }
 
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/DummyPlayerAdvancementData.java
similarity index 76%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/DummyPlayerAdvancementData.java
index e75d1211c..0b93a231b 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/DummyPlayerAdvancementData.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/DummyPlayerAdvancementData.java
@@ -1,13 +1,13 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
 
 import net.citizensnpcs.api.CitizensAPI;
-import net.minecraft.server.v1_13_R1.Advancement;
-import net.minecraft.server.v1_13_R1.AdvancementDataPlayer;
-import net.minecraft.server.v1_13_R1.AdvancementProgress;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
+import net.minecraft.server.v1_13_R2.Advancement;
+import net.minecraft.server.v1_13_R2.AdvancementDataPlayer;
+import net.minecraft.server.v1_13_R2.AdvancementProgress;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
 
 public class DummyPlayerAdvancementData extends AdvancementDataPlayer {
     private DummyPlayerAdvancementData() {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
similarity index 84%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
index 5d7342048..64b6a252d 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
@@ -1,15 +1,15 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.Set;
 
 import net.citizensnpcs.util.NMS;
-import net.minecraft.server.v1_13_R1.Advancement;
-import net.minecraft.server.v1_13_R1.AdvancementDataPlayer;
-import net.minecraft.server.v1_13_R1.AdvancementProgress;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.MinecraftServer;
+import net.minecraft.server.v1_13_R2.Advancement;
+import net.minecraft.server.v1_13_R2.AdvancementDataPlayer;
+import net.minecraft.server.v1_13_R2.AdvancementProgress;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.MinecraftServer;
 
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
similarity index 86%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index 206b19977..bd744a998 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -22,14 +22,14 @@ import org.bukkit.World;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
-import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_13_R1.CraftSound;
-import org.bukkit.craftbukkit.v1_13_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_13_R1.boss.CraftBossBar;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_13_R1.entity.CraftWither;
-import org.bukkit.craftbukkit.v1_13_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_13_R2.CraftSound;
+import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_13_R2.boss.CraftBossBar;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftWither;
+import org.bukkit.craftbukkit.v1_13_R2.event.CraftEventFactory;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.LivingEntity;
@@ -67,108 +67,108 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
 import net.citizensnpcs.api.trait.TraitInfo;
 import net.citizensnpcs.api.util.Messaging;
-import net.citizensnpcs.nms.v1_13_R1.entity.BatController;
-import net.citizensnpcs.nms.v1_13_R1.entity.BlazeController;
-import net.citizensnpcs.nms.v1_13_R1.entity.CaveSpiderController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ChickenController;
-import net.citizensnpcs.nms.v1_13_R1.entity.CodController;
-import net.citizensnpcs.nms.v1_13_R1.entity.CowController;
-import net.citizensnpcs.nms.v1_13_R1.entity.CreeperController;
-import net.citizensnpcs.nms.v1_13_R1.entity.DolphinController;
-import net.citizensnpcs.nms.v1_13_R1.entity.DrownedController;
-import net.citizensnpcs.nms.v1_13_R1.entity.EnderDragonController;
-import net.citizensnpcs.nms.v1_13_R1.entity.EndermanController;
-import net.citizensnpcs.nms.v1_13_R1.entity.EndermiteController;
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.citizensnpcs.nms.v1_13_R1.entity.EvokerController;
-import net.citizensnpcs.nms.v1_13_R1.entity.GhastController;
-import net.citizensnpcs.nms.v1_13_R1.entity.GiantController;
-import net.citizensnpcs.nms.v1_13_R1.entity.GuardianController;
-import net.citizensnpcs.nms.v1_13_R1.entity.GuardianElderController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HorseController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HorseDonkeyController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HorseMuleController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HorseSkeletonController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HorseZombieController;
-import net.citizensnpcs.nms.v1_13_R1.entity.HumanController;
-import net.citizensnpcs.nms.v1_13_R1.entity.IllusionerController;
-import net.citizensnpcs.nms.v1_13_R1.entity.IronGolemController;
-import net.citizensnpcs.nms.v1_13_R1.entity.LlamaController;
-import net.citizensnpcs.nms.v1_13_R1.entity.MagmaCubeController;
-import net.citizensnpcs.nms.v1_13_R1.entity.MushroomCowController;
-import net.citizensnpcs.nms.v1_13_R1.entity.OcelotController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ParrotController;
-import net.citizensnpcs.nms.v1_13_R1.entity.PhantomController;
-import net.citizensnpcs.nms.v1_13_R1.entity.PigController;
-import net.citizensnpcs.nms.v1_13_R1.entity.PigZombieController;
-import net.citizensnpcs.nms.v1_13_R1.entity.PolarBearController;
-import net.citizensnpcs.nms.v1_13_R1.entity.PufferFishController;
-import net.citizensnpcs.nms.v1_13_R1.entity.RabbitController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SalmonController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SheepController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ShulkerController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SilverfishController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonStrayController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SkeletonWitherController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SlimeController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SnowmanController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SpiderController;
-import net.citizensnpcs.nms.v1_13_R1.entity.SquidController;
-import net.citizensnpcs.nms.v1_13_R1.entity.TropicalFishController;
-import net.citizensnpcs.nms.v1_13_R1.entity.TurtleController;
-import net.citizensnpcs.nms.v1_13_R1.entity.VexController;
-import net.citizensnpcs.nms.v1_13_R1.entity.VillagerController;
-import net.citizensnpcs.nms.v1_13_R1.entity.VindicatorController;
-import net.citizensnpcs.nms.v1_13_R1.entity.WitchController;
-import net.citizensnpcs.nms.v1_13_R1.entity.WitherController;
-import net.citizensnpcs.nms.v1_13_R1.entity.WolfController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ZombieController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ZombieHuskController;
-import net.citizensnpcs.nms.v1_13_R1.entity.ZombieVillagerController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.AreaEffectCloudController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ArmorStandController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.BoatController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.DragonFireballController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EggController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderCrystalController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderPearlController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EnderSignalController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.EvokerFangsController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FallingBlockController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FireworkController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.FishingHookController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ItemController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ItemFrameController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LargeFireballController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LeashController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.LlamaSpitController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartChestController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartCommandController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartFurnaceController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartHopperController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartRideableController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.MinecartTNTController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.PaintingController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ShulkerBulletController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SmallFireballController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SnowballController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.SpectralArrowController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.TNTPrimedController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownExpBottleController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownPotionController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.ThrownTridentController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.TippedArrowController;
-import net.citizensnpcs.nms.v1_13_R1.entity.nonliving.WitherSkullController;
-import net.citizensnpcs.nms.v1_13_R1.network.EmptyChannel;
-import net.citizensnpcs.nms.v1_13_R1.trait.BossBarTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.Commands;
-import net.citizensnpcs.nms.v1_13_R1.trait.LlamaTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.ParrotTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.PhantomTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.PufferFishTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.ShulkerTrait;
-import net.citizensnpcs.nms.v1_13_R1.trait.TropicalFishTrait;
+import net.citizensnpcs.nms.v1_13_R2.entity.BatController;
+import net.citizensnpcs.nms.v1_13_R2.entity.BlazeController;
+import net.citizensnpcs.nms.v1_13_R2.entity.CaveSpiderController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ChickenController;
+import net.citizensnpcs.nms.v1_13_R2.entity.CodController;
+import net.citizensnpcs.nms.v1_13_R2.entity.CowController;
+import net.citizensnpcs.nms.v1_13_R2.entity.CreeperController;
+import net.citizensnpcs.nms.v1_13_R2.entity.DolphinController;
+import net.citizensnpcs.nms.v1_13_R2.entity.DrownedController;
+import net.citizensnpcs.nms.v1_13_R2.entity.EnderDragonController;
+import net.citizensnpcs.nms.v1_13_R2.entity.EndermanController;
+import net.citizensnpcs.nms.v1_13_R2.entity.EndermiteController;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.citizensnpcs.nms.v1_13_R2.entity.EvokerController;
+import net.citizensnpcs.nms.v1_13_R2.entity.GhastController;
+import net.citizensnpcs.nms.v1_13_R2.entity.GiantController;
+import net.citizensnpcs.nms.v1_13_R2.entity.GuardianController;
+import net.citizensnpcs.nms.v1_13_R2.entity.GuardianElderController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HorseController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HorseDonkeyController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HorseMuleController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HorseSkeletonController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HorseZombieController;
+import net.citizensnpcs.nms.v1_13_R2.entity.HumanController;
+import net.citizensnpcs.nms.v1_13_R2.entity.IllusionerController;
+import net.citizensnpcs.nms.v1_13_R2.entity.IronGolemController;
+import net.citizensnpcs.nms.v1_13_R2.entity.LlamaController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MagmaCubeController;
+import net.citizensnpcs.nms.v1_13_R2.entity.MushroomCowController;
+import net.citizensnpcs.nms.v1_13_R2.entity.OcelotController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ParrotController;
+import net.citizensnpcs.nms.v1_13_R2.entity.PhantomController;
+import net.citizensnpcs.nms.v1_13_R2.entity.PigController;
+import net.citizensnpcs.nms.v1_13_R2.entity.PigZombieController;
+import net.citizensnpcs.nms.v1_13_R2.entity.PolarBearController;
+import net.citizensnpcs.nms.v1_13_R2.entity.PufferFishController;
+import net.citizensnpcs.nms.v1_13_R2.entity.RabbitController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SalmonController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SheepController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ShulkerController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SilverfishController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SkeletonController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SkeletonStrayController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SkeletonWitherController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SlimeController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SnowmanController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SpiderController;
+import net.citizensnpcs.nms.v1_13_R2.entity.SquidController;
+import net.citizensnpcs.nms.v1_13_R2.entity.TropicalFishController;
+import net.citizensnpcs.nms.v1_13_R2.entity.TurtleController;
+import net.citizensnpcs.nms.v1_13_R2.entity.VexController;
+import net.citizensnpcs.nms.v1_13_R2.entity.VillagerController;
+import net.citizensnpcs.nms.v1_13_R2.entity.VindicatorController;
+import net.citizensnpcs.nms.v1_13_R2.entity.WitchController;
+import net.citizensnpcs.nms.v1_13_R2.entity.WitherController;
+import net.citizensnpcs.nms.v1_13_R2.entity.WolfController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ZombieController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ZombieHuskController;
+import net.citizensnpcs.nms.v1_13_R2.entity.ZombieVillagerController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.AreaEffectCloudController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ArmorStandController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.BoatController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.DragonFireballController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EggController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EnderCrystalController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EnderPearlController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EnderSignalController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.EvokerFangsController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.FallingBlockController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.FireworkController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.FishingHookController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ItemController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ItemFrameController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.LargeFireballController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.LeashController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.LlamaSpitController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartChestController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartCommandController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartFurnaceController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartHopperController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartRideableController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.MinecartTNTController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.PaintingController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ShulkerBulletController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.SmallFireballController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.SnowballController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.SpectralArrowController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.TNTPrimedController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ThrownExpBottleController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ThrownPotionController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.ThrownTridentController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.TippedArrowController;
+import net.citizensnpcs.nms.v1_13_R2.entity.nonliving.WitherSkullController;
+import net.citizensnpcs.nms.v1_13_R2.network.EmptyChannel;
+import net.citizensnpcs.nms.v1_13_R2.trait.BossBarTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.Commands;
+import net.citizensnpcs.nms.v1_13_R2.trait.LlamaTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.ParrotTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.PhantomTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.PufferFishTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.ShulkerTrait;
+import net.citizensnpcs.nms.v1_13_R2.trait.TropicalFishTrait;
 import net.citizensnpcs.npc.EntityControllers;
 import net.citizensnpcs.npc.ai.MCNavigationStrategy.MCNavigator;
 import net.citizensnpcs.npc.ai.MCTargetStrategy.TargetNavigator;
@@ -181,57 +181,58 @@ import net.citizensnpcs.util.NMSBridge;
 import net.citizensnpcs.util.PlayerAnimation;
 import net.citizensnpcs.util.PlayerUpdateTask;
 import net.citizensnpcs.util.Util;
-import net.minecraft.server.v1_13_R1.AttributeInstance;
-import net.minecraft.server.v1_13_R1.AxisAlignedBB;
-import net.minecraft.server.v1_13_R1.Block;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.BossBattleServer;
-import net.minecraft.server.v1_13_R1.ControllerJump;
-import net.minecraft.server.v1_13_R1.CrashReport;
-import net.minecraft.server.v1_13_R1.CrashReportSystemDetails;
-import net.minecraft.server.v1_13_R1.DamageSource;
-import net.minecraft.server.v1_13_R1.DataWatcherObject;
-import net.minecraft.server.v1_13_R1.EnchantmentManager;
-import net.minecraft.server.v1_13_R1.Enchantments;
-import net.minecraft.server.v1_13_R1.EnderDragonBattle;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityBird;
-import net.minecraft.server.v1_13_R1.EntityEnderDragon;
-import net.minecraft.server.v1_13_R1.EntityFishingHook;
-import net.minecraft.server.v1_13_R1.EntityHorse;
-import net.minecraft.server.v1_13_R1.EntityHorseAbstract;
-import net.minecraft.server.v1_13_R1.EntityHuman;
-import net.minecraft.server.v1_13_R1.EntityInsentient;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.EntityMinecartAbstract;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EntityPolarBear;
-import net.minecraft.server.v1_13_R1.EntityRabbit;
-import net.minecraft.server.v1_13_R1.EntityShulker;
-import net.minecraft.server.v1_13_R1.EntityTameableAnimal;
-import net.minecraft.server.v1_13_R1.EntityTracker;
-import net.minecraft.server.v1_13_R1.EntityTrackerEntry;
-import net.minecraft.server.v1_13_R1.EntityTypes;
-import net.minecraft.server.v1_13_R1.EntityWither;
-import net.minecraft.server.v1_13_R1.EnumMoveType;
-import net.minecraft.server.v1_13_R1.GenericAttributes;
-import net.minecraft.server.v1_13_R1.MathHelper;
-import net.minecraft.server.v1_13_R1.MinecraftKey;
-import net.minecraft.server.v1_13_R1.MobEffects;
-import net.minecraft.server.v1_13_R1.NavigationAbstract;
-import net.minecraft.server.v1_13_R1.NetworkManager;
-import net.minecraft.server.v1_13_R1.Packet;
-import net.minecraft.server.v1_13_R1.PacketPlayOutEntityTeleport;
-import net.minecraft.server.v1_13_R1.PacketPlayOutPlayerInfo;
-import net.minecraft.server.v1_13_R1.PathEntity;
-import net.minecraft.server.v1_13_R1.PathPoint;
-import net.minecraft.server.v1_13_R1.PathfinderGoalSelector;
-import net.minecraft.server.v1_13_R1.RegistryMaterials;
-import net.minecraft.server.v1_13_R1.ReportedException;
-import net.minecraft.server.v1_13_R1.SoundEffect;
-import net.minecraft.server.v1_13_R1.SoundEffects;
-import net.minecraft.server.v1_13_R1.Vec3D;
-import net.minecraft.server.v1_13_R1.WorldServer;
+import net.minecraft.server.v1_13_R2.AttributeInstance;
+import net.minecraft.server.v1_13_R2.AxisAlignedBB;
+import net.minecraft.server.v1_13_R2.Block;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.BossBattleServer;
+import net.minecraft.server.v1_13_R2.ControllerJump;
+import net.minecraft.server.v1_13_R2.CrashReport;
+import net.minecraft.server.v1_13_R2.CrashReportSystemDetails;
+import net.minecraft.server.v1_13_R2.DamageSource;
+import net.minecraft.server.v1_13_R2.DataWatcherObject;
+import net.minecraft.server.v1_13_R2.EnchantmentManager;
+import net.minecraft.server.v1_13_R2.Enchantments;
+import net.minecraft.server.v1_13_R2.EnderDragonBattle;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityBird;
+import net.minecraft.server.v1_13_R2.EntityEnderDragon;
+import net.minecraft.server.v1_13_R2.EntityFishingHook;
+import net.minecraft.server.v1_13_R2.EntityHorse;
+import net.minecraft.server.v1_13_R2.EntityHorseAbstract;
+import net.minecraft.server.v1_13_R2.EntityHuman;
+import net.minecraft.server.v1_13_R2.EntityInsentient;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.EntityMinecartAbstract;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.EntityPolarBear;
+import net.minecraft.server.v1_13_R2.EntityRabbit;
+import net.minecraft.server.v1_13_R2.EntityShulker;
+import net.minecraft.server.v1_13_R2.EntityTameableAnimal;
+import net.minecraft.server.v1_13_R2.EntityTracker;
+import net.minecraft.server.v1_13_R2.EntityTrackerEntry;
+import net.minecraft.server.v1_13_R2.EntityTypes;
+import net.minecraft.server.v1_13_R2.EntityWither;
+import net.minecraft.server.v1_13_R2.EnumMoveType;
+import net.minecraft.server.v1_13_R2.GenericAttributes;
+import net.minecraft.server.v1_13_R2.IRegistry;
+import net.minecraft.server.v1_13_R2.MathHelper;
+import net.minecraft.server.v1_13_R2.MinecraftKey;
+import net.minecraft.server.v1_13_R2.MobEffects;
+import net.minecraft.server.v1_13_R2.NavigationAbstract;
+import net.minecraft.server.v1_13_R2.NetworkManager;
+import net.minecraft.server.v1_13_R2.Packet;
+import net.minecraft.server.v1_13_R2.PacketPlayOutEntityTeleport;
+import net.minecraft.server.v1_13_R2.PacketPlayOutPlayerInfo;
+import net.minecraft.server.v1_13_R2.PathEntity;
+import net.minecraft.server.v1_13_R2.PathPoint;
+import net.minecraft.server.v1_13_R2.PathfinderGoalSelector;
+import net.minecraft.server.v1_13_R2.RegistryMaterials;
+import net.minecraft.server.v1_13_R2.ReportedException;
+import net.minecraft.server.v1_13_R2.SoundEffect;
+import net.minecraft.server.v1_13_R2.SoundEffects;
+import net.minecraft.server.v1_13_R2.Vec3D;
+import net.minecraft.server.v1_13_R2.WorldServer;
 
 @SuppressWarnings("unchecked")
 public class NMSImpl implements NMSBridge {
@@ -301,7 +302,7 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
 
-        MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().ar();
+        MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().ap();
         if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
             return sessionService.fillProfileProperties(profile, requireSecure);
         }
@@ -463,7 +464,7 @@ public class NMSImpl implements NMSBridge {
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
             final Function<NavigationAbstract, Boolean> function) {
-        net.minecraft.server.v1_13_R1.Entity raw = getHandle(entity);
+        net.minecraft.server.v1_13_R2.Entity raw = getHandle(entity);
         raw.onGround = true;
         // not sure of a better way around this - if onGround is false, then
         // navigation won't execute, and calling entity.move doesn't
@@ -788,7 +789,7 @@ public class NMSImpl implements NMSBridge {
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
-            MinecraftKey key = ENTITY_REGISTRY.b(type);
+            MinecraftKey key = ENTITY_REGISTRY.getKey(type);
             if (key == null)
                 continue;
             int code = ENTITY_REGISTRY.a(type);
@@ -1454,7 +1455,7 @@ public class NMSImpl implements NMSBridge {
 
     public static SoundEffect getSoundEffect(NPC npc, SoundEffect snd, String meta) {
         return npc == null || !npc.data().has(meta) ? snd
-                : SoundEffect.a.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString())));
+                : IRegistry.SOUND_EVENT.get(new MinecraftKey(npc.data().get(meta, snd == null ? "" : snd.toString())));
     }
 
     public static void initNetworkManager(NetworkManager network) {
@@ -1486,7 +1487,7 @@ public class NMSImpl implements NMSBridge {
         int offset = npc.data().get(NPC.MINECART_OFFSET_METADATA, 0);
         minecart.a(mat != null);
         if (mat != null) {
-            minecart.setDisplayBlock(Block.getById(mat.getId()).getBlockData());
+            minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData());
         }
         minecart.setDisplayBlockOffset(offset);
     }
@@ -1566,7 +1567,7 @@ public class NMSImpl implements NMSBridge {
         navigation.d();
     };
 
-    private static Field ADVANCEMENT_PLAYER_FIELD = NMS.getFinalField(EntityPlayer.class, "cg");
+    private static Field ADVANCEMENT_PLAYER_FIELD = NMS.getFinalField(EntityPlayer.class, "cf");
     private static final Set<EntityType> BAD_CONTROLLER_LOOK = EnumSet.of(EntityType.POLAR_BEAR, EntityType.SILVERFISH,
             EntityType.SHULKER, EntityType.ENDERMITE, EntityType.ENDER_DRAGON, EntityType.BAT, EntityType.SLIME,
             EntityType.MAGMA_CUBE, EntityType.HORSE, EntityType.GHAST);
@@ -1592,8 +1593,7 @@ public class NMSImpl implements NMSBridge {
     static {
         try {
             Field field = NMS.getFinalField(EntityTypes.class, "REGISTRY");
-            ENTITY_REGISTRY = new CustomEntityRegistry(
-                    (RegistryMaterials<MinecraftKey, EntityTypes<?>>) field.get(null));
+            ENTITY_REGISTRY = new CustomEntityRegistry((RegistryMaterials<EntityTypes<?>>) field.get(null));
             field.set(null, ENTITY_REGISTRY);
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
similarity index 93%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
index abf8e70f3..f998fb163 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerAnimationImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.util.EnumMap;
 
@@ -17,13 +17,13 @@ import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.trait.ArmorStandTrait;
 import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.PlayerAnimation;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EnumHand;
-import net.minecraft.server.v1_13_R1.Packet;
-import net.minecraft.server.v1_13_R1.PacketPlayOutAnimation;
-import net.minecraft.server.v1_13_R1.PacketPlayOutBed;
-import net.minecraft.server.v1_13_R1.PacketPlayOutEntityMetadata;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.EnumHand;
+import net.minecraft.server.v1_13_R2.Packet;
+import net.minecraft.server.v1_13_R2.PacketPlayOutAnimation;
+import net.minecraft.server.v1_13_R2.PacketPlayOutBed;
+import net.minecraft.server.v1_13_R2.PacketPlayOutEntityMetadata;
 
 public class PlayerAnimationImpl {
     public static void play(PlayerAnimation animation, Player bplayer, int radius) {
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerJump.java
similarity index 76%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerJump.java
index 88ae4f4be..31518af8e 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerJump.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerJump.java
@@ -1,6 +1,6 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
 
 public class PlayerControllerJump {
     private final EntityHumanNPC a;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java
similarity index 91%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java
index 7b4a2a4fb..5ecbc0b84 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerLook.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java
@@ -1,9 +1,9 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.MathHelper;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.MathHelper;
 
 public class PlayerControllerLook {
     private final EntityHumanNPC a;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
similarity index 87%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
index 271793713..c69615b44 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerControllerMove.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
@@ -1,16 +1,16 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.util.Random;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
 import net.citizensnpcs.util.NMS;
-import net.minecraft.server.v1_13_R1.AttributeInstance;
-import net.minecraft.server.v1_13_R1.ControllerMove;
-import net.minecraft.server.v1_13_R1.EntityInsentient;
-import net.minecraft.server.v1_13_R1.EntityLiving;
-import net.minecraft.server.v1_13_R1.EntitySlime;
-import net.minecraft.server.v1_13_R1.GenericAttributes;
-import net.minecraft.server.v1_13_R1.MathHelper;
+import net.minecraft.server.v1_13_R2.AttributeInstance;
+import net.minecraft.server.v1_13_R2.ControllerMove;
+import net.minecraft.server.v1_13_R2.EntityInsentient;
+import net.minecraft.server.v1_13_R2.EntityLiving;
+import net.minecraft.server.v1_13_R2.EntitySlime;
+import net.minecraft.server.v1_13_R2.GenericAttributes;
+import net.minecraft.server.v1_13_R2.MathHelper;
 
 public class PlayerControllerMove extends ControllerMove {
     protected EntityLiving a;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
similarity index 93%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
index 932054d77..d1b609cb5 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerNavigation.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
@@ -1,28 +1,28 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.minecraft.server.v1_13_R1.AttributeInstance;
-import net.minecraft.server.v1_13_R1.Block;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.Blocks;
-import net.minecraft.server.v1_13_R1.ChunkCache;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityInsentient;
-import net.minecraft.server.v1_13_R1.EntityTypes;
-import net.minecraft.server.v1_13_R1.GenericAttributes;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.MathHelper;
-import net.minecraft.server.v1_13_R1.NavigationAbstract;
-import net.minecraft.server.v1_13_R1.PathEntity;
-import net.minecraft.server.v1_13_R1.PathMode;
-import net.minecraft.server.v1_13_R1.PathPoint;
-import net.minecraft.server.v1_13_R1.PathType;
-import net.minecraft.server.v1_13_R1.Pathfinder;
-import net.minecraft.server.v1_13_R1.PathfinderAbstract;
-import net.minecraft.server.v1_13_R1.PathfinderNormal;
-import net.minecraft.server.v1_13_R1.SystemUtils;
-import net.minecraft.server.v1_13_R1.Vec3D;
-import net.minecraft.server.v1_13_R1.World;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.minecraft.server.v1_13_R2.AttributeInstance;
+import net.minecraft.server.v1_13_R2.Block;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.Blocks;
+import net.minecraft.server.v1_13_R2.ChunkCache;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityInsentient;
+import net.minecraft.server.v1_13_R2.EntityTypes;
+import net.minecraft.server.v1_13_R2.GenericAttributes;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.MathHelper;
+import net.minecraft.server.v1_13_R2.NavigationAbstract;
+import net.minecraft.server.v1_13_R2.PathEntity;
+import net.minecraft.server.v1_13_R2.PathMode;
+import net.minecraft.server.v1_13_R2.PathPoint;
+import net.minecraft.server.v1_13_R2.PathType;
+import net.minecraft.server.v1_13_R2.Pathfinder;
+import net.minecraft.server.v1_13_R2.PathfinderAbstract;
+import net.minecraft.server.v1_13_R2.PathfinderNormal;
+import net.minecraft.server.v1_13_R2.SystemUtils;
+import net.minecraft.server.v1_13_R2.Vec3D;
+import net.minecraft.server.v1_13_R2.World;
 
 public class PlayerNavigation extends NavigationAbstract {
     protected EntityHumanNPC a;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
similarity index 92%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
index c1e31db67..281053d0a 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinder.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
@@ -1,18 +1,18 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.util.Set;
 
 import com.google.common.collect.Sets;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityInsentient;
-import net.minecraft.server.v1_13_R1.IBlockAccess;
-import net.minecraft.server.v1_13_R1.Path;
-import net.minecraft.server.v1_13_R1.PathEntity;
-import net.minecraft.server.v1_13_R1.PathPoint;
-import net.minecraft.server.v1_13_R1.Pathfinder;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityInsentient;
+import net.minecraft.server.v1_13_R2.IBlockAccess;
+import net.minecraft.server.v1_13_R2.Path;
+import net.minecraft.server.v1_13_R2.PathEntity;
+import net.minecraft.server.v1_13_R2.PathPoint;
+import net.minecraft.server.v1_13_R2.Pathfinder;
 
 public class PlayerPathfinder extends Pathfinder {
     private final Path a = new Path();
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
similarity index 82%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
index 7e755957c..ed605638d 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
@@ -1,11 +1,11 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.minecraft.server.v1_13_R1.IBlockAccess;
-import net.minecraft.server.v1_13_R1.IntHashMap;
-import net.minecraft.server.v1_13_R1.MathHelper;
-import net.minecraft.server.v1_13_R1.PathPoint;
-import net.minecraft.server.v1_13_R1.PathfinderAbstract;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.minecraft.server.v1_13_R2.IBlockAccess;
+import net.minecraft.server.v1_13_R2.IntHashMap;
+import net.minecraft.server.v1_13_R2.MathHelper;
+import net.minecraft.server.v1_13_R2.PathPoint;
+import net.minecraft.server.v1_13_R2.PathfinderAbstract;
 
 public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
     protected IBlockAccess a;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
similarity index 92%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
index c8b5b723b..5194a219f 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerPathfinderNormal.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -6,31 +6,31 @@ import java.util.Iterator;
 
 import com.google.common.collect.Sets;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
-import net.minecraft.server.v1_13_R1.AxisAlignedBB;
-import net.minecraft.server.v1_13_R1.Block;
-import net.minecraft.server.v1_13_R1.BlockCobbleWall;
-import net.minecraft.server.v1_13_R1.BlockDoor;
-import net.minecraft.server.v1_13_R1.BlockFence;
-import net.minecraft.server.v1_13_R1.BlockFenceGate;
-import net.minecraft.server.v1_13_R1.BlockMinecartTrackAbstract;
-import net.minecraft.server.v1_13_R1.BlockPosition;
-import net.minecraft.server.v1_13_R1.BlockPosition.MutableBlockPosition;
-import net.minecraft.server.v1_13_R1.Blocks;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityInsentient;
-import net.minecraft.server.v1_13_R1.EnumDirection;
-import net.minecraft.server.v1_13_R1.EnumDirection.EnumAxis;
-import net.minecraft.server.v1_13_R1.Fluid;
-import net.minecraft.server.v1_13_R1.IBlockAccess;
-import net.minecraft.server.v1_13_R1.IBlockData;
-import net.minecraft.server.v1_13_R1.Material;
-import net.minecraft.server.v1_13_R1.MathHelper;
-import net.minecraft.server.v1_13_R1.PathMode;
-import net.minecraft.server.v1_13_R1.PathPoint;
-import net.minecraft.server.v1_13_R1.PathType;
-import net.minecraft.server.v1_13_R1.TagsFluid;
-import net.minecraft.server.v1_13_R1.VoxelShape;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
+import net.minecraft.server.v1_13_R2.AxisAlignedBB;
+import net.minecraft.server.v1_13_R2.Block;
+import net.minecraft.server.v1_13_R2.BlockCobbleWall;
+import net.minecraft.server.v1_13_R2.BlockDoor;
+import net.minecraft.server.v1_13_R2.BlockFence;
+import net.minecraft.server.v1_13_R2.BlockFenceGate;
+import net.minecraft.server.v1_13_R2.BlockMinecartTrackAbstract;
+import net.minecraft.server.v1_13_R2.BlockPosition;
+import net.minecraft.server.v1_13_R2.BlockPosition.MutableBlockPosition;
+import net.minecraft.server.v1_13_R2.Blocks;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityInsentient;
+import net.minecraft.server.v1_13_R2.EnumDirection;
+import net.minecraft.server.v1_13_R2.EnumDirection.EnumAxis;
+import net.minecraft.server.v1_13_R2.Fluid;
+import net.minecraft.server.v1_13_R2.IBlockAccess;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.Material;
+import net.minecraft.server.v1_13_R2.MathHelper;
+import net.minecraft.server.v1_13_R2.PathMode;
+import net.minecraft.server.v1_13_R2.PathPoint;
+import net.minecraft.server.v1_13_R2.PathType;
+import net.minecraft.server.v1_13_R2.TagsFluid;
+import net.minecraft.server.v1_13_R2.VoxelShape;
 
 public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     protected float j;
@@ -457,9 +457,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 return PathType.FENCE;
             } else {
                 Fluid var9 = var1.b(var5);
-                if (var9.a(TagsFluid.a)) {
+                if (var9.a(TagsFluid.WATER)) {
                     return PathType.WATER;
-                } else if (var9.a(TagsFluid.b)) {
+                } else if (var9.a(TagsFluid.LAVA)) {
                     return PathType.LAVA;
                 } else {
                     return var6.a(var1, var5, PathMode.LAND) ? PathType.OPEN : PathType.BLOCKED;
diff --git a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
similarity index 93%
rename from v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java
rename to v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
index 5307cda62..e5d85da3b 100644
--- a/v1_13_R1/src/main/java/net/citizensnpcs/nms/v1_13_R1/util/PlayerlistTrackerEntry.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
@@ -1,15 +1,15 @@
-package net.citizensnpcs.nms.v1_13_R1.util;
+package net.citizensnpcs.nms.v1_13_R2.util;
 
 import java.lang.reflect.Field;
 
 import org.bukkit.entity.Player;
 
-import net.citizensnpcs.nms.v1_13_R1.entity.EntityHumanNPC;
+import net.citizensnpcs.nms.v1_13_R2.entity.EntityHumanNPC;
 import net.citizensnpcs.npc.skin.SkinnableEntity;
 import net.citizensnpcs.util.NMS;
-import net.minecraft.server.v1_13_R1.Entity;
-import net.minecraft.server.v1_13_R1.EntityPlayer;
-import net.minecraft.server.v1_13_R1.EntityTrackerEntry;
+import net.minecraft.server.v1_13_R2.Entity;
+import net.minecraft.server.v1_13_R2.EntityPlayer;
+import net.minecraft.server.v1_13_R2.EntityTrackerEntry;
 
 public class PlayerlistTrackerEntry extends EntityTrackerEntry {
     public PlayerlistTrackerEntry(Entity entity, int i, int j, int k, boolean flag) {
diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml
index 54651eee1..d26273ce6 100644
--- a/v1_8_R3/pom.xml
+++ b/v1_8_R3/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>net.citizensnpcs</groupId>
 	    <artifactId>citizens-parent</artifactId>
-	    <version>2.0.23-SNAPSHOT</version>
+	    <version>2.0.24-SNAPSHOT</version>
 	</parent> 
 	<artifactId>citizens-v1_8_R3</artifactId>