32 lines
1.9 KiB
Diff
32 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Fri, 12 Jun 2020 16:51:39 -0700
|
||
|
|
Subject: [PATCH] Prevent position desync in playerconnection causing tp
|
||
|
|
exploit
|
||
|
|
|
||
|
|
Caused the server to revert to the player's overworld coordinates
|
||
|
|
after teleporting into the end.
|
||
|
|
|
||
|
|
Sidenote: The underlying issue is that the move call can teleport
|
||
|
|
entities and do other things like kill the entity. In the future,
|
||
|
|
to fix all exploits derieved from this usually unexpected
|
||
|
|
behaviour, we need to move all of this dangerous logic outside
|
||
|
|
of the move call and into an appropriate place in the tick method.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index 0625bc7ffd07b66b27176fe62ae3061aa7c67df2..fbafb89cc63744d942933546026e272122bd9fba 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -1324,6 +1324,11 @@ public class ServerGamePacketListenerImpl implements ServerGamePacketListener {
|
||
|
|
|
||
|
|
this.player.move(MoverType.PLAYER, new Vec3(d7, d8, d9));
|
||
|
|
this.player.setOnGround(packet.isOnGround()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
|
||
|
|
+ // Paper start - prevent position desync
|
||
|
|
+ if (this.awaitingPositionFromClient != null) {
|
||
|
|
+ return; // ... thanks Mojang for letting move calls teleport across dimensions.
|
||
|
|
+ }
|
||
|
|
+ // Paper end - prevent position desync
|
||
|
|
double d12 = d8;
|
||
|
|
|
||
|
|
d7 = d4 - this.player.getX();
|