aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch')
-rw-r--r--patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch
new file mode 100644
index 0000000000..ecc49e7279
--- /dev/null
+++ b/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Sat, 6 Aug 2022 18:10:14 -0400
+Subject: [PATCH] Set position before player sending on dimension change
+
+This causes a moment where the player entity is sent with the previous location, and the
+teleport packet which is sent shortly after is meant to correct that.
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 5fca2fc3733880721ae6ff2db020c9809bfffc16..af7acb628b84539b1ee5ef1934f75f091c4cd91e 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player {
+
+ // CraftBukkit end
+ this.setLevel(worldserver);
++ this.moveTo(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch()); // Paper - Set the location before
+ worldserver.addDuringPortalTeleport(this);
+ this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
+ this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)