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
2023-08-17 22:51:34 +02:00
index 661a5ee162829a060284a870e1704f615cc768ac..21c7cf0af2cc65f1f0275f4089326cdcfd94ec90 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
2023-08-06 02:21:59 +02:00
@@ -578,6 +578,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
2023-06-08 10:08:08 +02:00
this.disconnect(Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT); // Paper - kick event cause
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
2023-06-08 10:08:08 +02:00
2022-03-14 20:28:02 +01:00
if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
2023-06-08 10:08:08 +02:00
ServerLevel worldserver = this.player.serverLevel();