26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Mon, 14 Mar 2022 12:35:37 -0700
|
||
|
|
Subject: [PATCH] Don't allow vehicle movement from players while teleporting
|
||
|
|
|
||
|
|
Bring the vehicle move packet behavior in line with the
|
||
|
|
regular player move packet.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index 952debf2fb4abf675e226224909b14c866528e62..68e1ab0057452228817ecbc6556338a8906c2538 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -517,6 +517,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||
|
|
} else {
|
||
|
|
Entity entity = this.player.getRootVehicle();
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ if (this.awaitingPositionFromClient != null) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
|
||
|
|
ServerLevel worldserver = this.player.getLevel();
|
||
|
|
double d0 = entity.getX();final double fromX = d0; // Paper - OBFHELPER
|