Add PrepareGrindstoneEvent

This commit is contained in:
William Blake Galbreath
2020-06-18 23:31:20 -05:00
parent 5c7ae7738c
commit fdf64880d1
18 changed files with 135 additions and 17 deletions

View File

@@ -0,0 +1,29 @@
From 9ecbe216e237d1ec36d673217db1c26e514748be 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] PaperPR - Prevent position desync in playerconnection causing
tp exploit
---
src/main/java/net/minecraft/server/PlayerConnection.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3a1aa1d4da..c13296935c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1104,6 +1104,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
+ // Purpur start - prevent position desync
+ if (this.teleportPos != null) {
+ return; // ... thanks Mojang for letting move calls teleport across dimensions.
+ }
+ // Purpur end - prevent position desync
this.player.onGround = packetplayinflying.b();
double d12 = d8;
--
2.26.2