aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch')
-rw-r--r--patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
new file mode 100644
index 0000000000..898fc4db4e
--- /dev/null
+++ b/patches/server/0482-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -0,0 +1,83 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Tue, 25 Aug 2020 20:45:36 -0400
+Subject: [PATCH] Fix Entity Teleportation and cancel velocity if teleported
+
+Uses correct setPositionRotation for Entity teleporting instead of setLocation
+as this is how Vanilla teleports entities.
+
+Cancel any pending motion when teleported.
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index da6a0171bd63ac68635de1c23fc9eafa732503bd..214771e661ca3303af167fda3b623d83f0f63055 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -760,7 +760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ return;
+ }
+
+- this.player.absMoveTo(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot());
++ this.player.moveTo(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot()); // Paper - use proper moveTo for teleportation
+ this.lastGoodX = this.awaitingPositionFromClient.x;
+ this.lastGoodY = this.awaitingPositionFromClient.y;
+ this.lastGoodZ = this.awaitingPositionFromClient.z;
+@@ -1676,7 +1676,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ // CraftBukkit end
+
+ this.awaitingTeleportTime = this.tickCount;
+- this.player.absMoveTo(d0, d1, d2, f, f1);
++ this.player.moveTo(d0, d1, d2, f, f1); // Paper - use proper moveTo for teleportation
+ this.player.connection.send(new ClientboundPlayerPositionPacket(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport, flag));
+ }
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 544d59be3722cd13e0590a5b03059da0fd5ce364..9325d4b5cbcf3785985567deeb9f13e56a4124d0 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+
+ // CraftBukkit start
+ private static final int CURRENT_LEVEL = 2;
++ public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
+ static boolean isLevelAtLeast(CompoundTag tag, int level) {
+ return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
+ }
+@@ -1716,6 +1717,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ }
+
+ public void moveTo(double x, double y, double z, float yaw, float pitch) {
++ // Paper - cancel entity velocity if teleported
++ if (!preserveMotion) {
++ this.deltaMovement = Vec3.ZERO;
++ } else {
++ this.preserveMotion = false;
++ }
++ // Paper end
+ this.setPosRaw(x, y, z);
+ this.setYRot(yaw);
+ this.setXRot(pitch);
+diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+index e3d8814cbad30da795632afddf8ebc87eff72106..ee619590aa49323059947fbaee9e88d61df99789 100644
+--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
++++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+@@ -163,6 +163,7 @@ public abstract class BaseSpawner {
+ return;
+ }
+
++ entity.preserveMotion = true; // Paper - preserve entity motion from tag
+ entity.moveTo(entity.getX(), entity.getY(), entity.getZ(), randomsource.nextFloat() * 360.0F, 0.0F);
+ if (entity instanceof Mob) {
+ Mob entityinsentient = (Mob) entity;
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index c2282592a3e5c8e08acb30a8fe6f3a83dfe6d93d..40e6cd06f6b0cab2718c165cb38e772e90795917 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -561,7 +561,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ }
+
+ // entity.setLocation() throws no event, and so cannot be cancelled
+- this.entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
++ entity.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); // Paper - use proper moveTo, as per vanilla teleporting
+ // SPIGOT-619: Force sync head rotation also
+ this.entity.setYHeadRot(location.getYaw());
+