Update for 1.14.4

CitizensDev · Jul 21, 2019 · b1fc53f · b1fc53f
1 parent f4ef934
commit b1fc53f
Show file tree

Hide file tree

Showing 9 changed files with 256 additions and 232 deletions.
diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.14.3-R0.1-SNAPSHOT</craftbukkit.version>
+		<craftbukkit.version>1.14.4-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
 	<repositories>

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
@@ -101,9 +101,9 @@ public boolean d(NBTTagCompound save) {
         }
 
         @Override
-        public boolean dE() {
+        public boolean dD() {
             // block carrot-on-a-stick behaviour
-            return npc == null ? super.dE() : false;
+            return npc == null ? super.dD() : false;
         }
 
         @Override

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
@@ -121,12 +121,12 @@ public boolean d(NBTTagCompound save) {
         }
 
         @Override
-        public boolean dZ() {
+        public boolean dY() {
             if (blockingATrade) {
                 blockingATrade = false;
                 return true;
             }
-            return super.dZ();
+            return super.dY();
         }
 
         @Override

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java
@@ -121,12 +121,12 @@ public boolean d(NBTTagCompound save) {
         }
 
         @Override
-        public boolean dZ() {
+        public boolean dY() {
             if (blockingATrade) {
                 blockingATrade = false;
                 return true;
             }
-            return super.dZ();
+            return super.dY();
         }
 
         @Override

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java
@@ -20,7 +20,7 @@ public class CustomEntityRegistry extends RegistryBlocks {
     private final RegistryMaterials<EntityTypes<?>> wrapped;
 
     public CustomEntityRegistry(RegistryBlocks<EntityTypes<?>> original) {
-        super(original.a().b());
+        super(original.a().getNamespace());
         this.wrapped = original;
     }
 

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -454,13 +454,16 @@ public float getStepHeight(org.bukkit.entity.Entity entity) {
     @Override
     public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable<Vector> dest,
             final NavigatorParameters params) {
-        final PathEntity path = new PathEntity(Lists.<PathPoint> newArrayList(
+        List<PathPoint> list = Lists.<PathPoint> newArrayList(
                 Iterables.<Vector, PathPoint> transform(dest, new Function<Vector, PathPoint>() {
                     @Override
                     public PathPoint apply(Vector input) {
                         return new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ());
                     }
-                })));
+                }));
+        PathPoint last = list.size() > 0 ? list.get(list.size() - 1) : null;
+        final PathEntity path = new PathEntity(list, last != null ? new BlockPosition(last.a, last.b, last.c) : null,
+                true);
         return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
             @Override
             public Boolean apply(NavigationAbstract input) {