2022-03-14 20:28:02 +01:00
|
|
|
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
|
2022-07-27 23:32:15 +02:00
|
|
|
index 9a719ee2f2e1394458da2d459b4bc434e06786cd..8ac6bba7a4427733f9f03835480fd574fe17dd93 100644
|
2022-03-14 20:28:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-07-27 23:32:15 +02:00
|
|
|
@@ -586,6 +586,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
2022-03-14 20:28:02 +01:00
|
|
|
} else {
|
|
|
|
Entity entity = this.player.getRootVehicle();
|
|
|
|
|
|
|
|
+ // Paper start
|
2022-03-31 15:04:23 +02:00
|
|
|
+ if (this.awaitingPositionFromClient != null || this.player.isImmobile() || entity.isRemoved()) {
|
2022-03-14 20:28:02 +01:00
|
|
|
+ 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
|