2022-03-14 19:28:02 +00: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-09-26 20:16:21 +00:00
index e8302e9be8fda770e1396da40107ed22338de31b..42860936789e66128615d3d2dc7a2a7bf139240b 100644
2022-03-14 19:28:02 +00:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2023-09-22 15:24:59 +00:00
@@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2023-06-08 08:08:08 +00: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 19:28:02 +00:00
} else {
Entity entity = this.player.getRootVehicle();
+ // Paper start
2022-03-31 13:04:23 +00:00
+ if (this.awaitingPositionFromClient != null || this.player.isImmobile() || entity.isRemoved()) {
2022-03-14 19:28:02 +00:00
+ return;
+ }
+ // Paper end
2023-06-08 08:08:08 +00:00
2022-03-14 19:28:02 +00:00
if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
2023-06-08 08:08:08 +00:00
ServerLevel worldserver = this.player.serverLevel();