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
2024-12-03 22:06:05 +01:00
index 88ba98aee07764e418edb9052075acea557ceec9..864ab4d3de50ee9ce9ff2b0538aa46df43985a84 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
2024-12-03 19:54:10 +01:00
@@ -491,6 +491,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2024-06-14 03:30:23 +02:00
this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT); // Paper - kick event cause
2024-12-03 19:54:10 +01:00
} else if (!this.updateAwaitingTeleport() && this.player.hasClientLoaded()) {
2022-03-14 20:28:02 +01:00
Entity entity = this.player.getRootVehicle();
2024-01-18 18:52:00 +01:00
+ // Paper start - Don't allow vehicle movement from players while teleporting
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;
+ }
2024-01-18 18:52:00 +01:00
+ // Paper end - Don't allow vehicle movement from players while teleporting
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();