more reliable NMS teleport path for players

works even while mounted ... also fix up pom issues for Paper and shading
DenizenScript · Feb 23, 2021 · 964969e · 964969e
1 parent 9c63797
commit 964969e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -131,6 +131,10 @@
                                     <pattern>org.json</pattern>
                                     <shadedPattern>com.denizenscript.shaded.org.json</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.yaml</pattern>
+                                    <shadedPattern>com.denizenscript.shaded.org.yaml</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

diff --git a/paper/pom.xml b/paper/pom.xml
@@ -31,12 +31,6 @@
             <artifactId>paper-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java
@@ -445,7 +445,7 @@ else if (337.5 <= yaw && yaw < 360.0) {
 
     public abstract void move(Entity entity, Vector vector);
 
-    public abstract void teleport(Entity entity, Vector vector);
+    public abstract void teleport(Entity entity, Location loc);
 
     public abstract BoundingBox getBoundingBox(Entity entity);
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -712,7 +712,7 @@ public void spawnAt(Location location) {
         else if (entity != null && isUnique()) {
             entity.teleport(location);
             if (entity.getWorld().equals(location.getWorld())) { // Force the teleport through (for things like mounts)
-                NMSHandler.getEntityHelper().teleport(entity, location.toVector());
+                NMSHandler.getEntityHelper().teleport(entity, location);
             }
         }
         else {
@@ -869,7 +869,7 @@ else if (isFake) {
         else {
             entity.teleport(location);
             if (entity.getWorld().equals(location.getWorld())) { // Force the teleport through (for things like mounts)
-                NMSHandler.getEntityHelper().teleport(entity, location.toVector());
+                NMSHandler.getEntityHelper().teleport(entity, location);
             }
         }
     }

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java
@@ -577,7 +577,7 @@ public void move(Entity entity, Vector vector) {
     }
 
     @Override
-    public void teleport(Entity entity, Vector vector) {
+    public void teleport(Entity entity, Location vector) {
         ((CraftEntity) entity).getHandle().setPosition(vector.getX(), vector.getY(), vector.getZ());
     }
 

diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java
@@ -577,7 +577,7 @@ public void move(Entity entity, Vector vector) {
     }
 
     @Override
-    public void teleport(Entity entity, Vector vector) {
+    public void teleport(Entity entity, Location vector) {
         ((CraftEntity) entity).getHandle().setPosition(vector.getX(), vector.getY(), vector.getZ());
     }
 

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java
@@ -463,7 +463,7 @@ public void rotate(Entity entity, float yaw, float pitch) {
             Location location = entity.getLocation();
             location.setYaw(yaw);
             location.setPitch(pitch);
-            entity.teleport(location);
+            teleport(entity, location);
         }
         else if (entity instanceof LivingEntity) {
             if (entity instanceof EnderDragon) {
@@ -506,7 +506,7 @@ public void look(Entity entity, float yaw, float pitch) {
             handle.pitch = pitch;
         }
         else {
-            Debug.echoError("Cannot set look direction for unspawned entitity " + entity.getUniqueId());
+            Debug.echoError("Cannot set look direction for unspawned entity " + entity.getUniqueId());
         }
     }
 
@@ -578,8 +578,14 @@ public void move(Entity entity, Vector vector) {
     }
 
     @Override
-    public void teleport(Entity entity, Vector vector) {
-        ((CraftEntity) entity).getHandle().setPosition(vector.getX(), vector.getY(), vector.getZ());
+    public void teleport(Entity entity, Location loc) {
+        net.minecraft.server.v1_16_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle();
+        nmsEntity.yaw = loc.getYaw();
+        nmsEntity.pitch = loc.getPitch();
+        if (nmsEntity instanceof EntityPlayer) {
+            nmsEntity.teleportAndSync(loc.getX(), loc.getY(), loc.getZ());
+        }
+        nmsEntity.setPosition(loc.getX(), loc.getY(), loc.getZ());
     }
 
     @Override