mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
bb4002d82e
Use a proper teleport for teleporting to entities in different worlds. Validate that the target entity is valid and deny spectate requests from frozen players. Also, make sure the entity is spawned to the client before sending the camera packet. If the entity isn't spawned clientside when it receives the camera packet, then the client will not spectate the target entity.
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 3 May 2020 14:25:55 -0400
|
|
Subject: [PATCH] Sync position on teleportation
|
|
|
|
We've seen many a cases where the "last good" x/y/z is desynced from
|
|
the x/y/z that is checked for moving too fast.
|
|
|
|
Theory is that when you have multiple movement packets queued up,
|
|
and the player is teleported after the first then the 2nd and 3rd come in,
|
|
it is triggering a massive movement velocity.
|
|
|
|
This will ensure that the servers position is synchronized anytime player is teleported.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 625479b97adf19df67f04dcbe445d78bccb0fc2c..f692276617d9c24ded5e887090e00642b0d63eba 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -498,6 +498,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
this.o = this.teleportPos.x;
|
|
this.p = this.teleportPos.y;
|
|
this.q = this.teleportPos.z;
|
|
+ this.syncPosition(); // Paper
|
|
if (this.player.H()) {
|
|
this.player.I();
|
|
}
|
|
@@ -1277,6 +1278,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
|
|
this.A = this.e;
|
|
this.player.setLocation(d0, d1, d2, f, f1);
|
|
+ this.syncPosition(); // Paper
|
|
this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
|
|
}
|
|
|