diff options
Diffstat (limited to 'patches/server/0628-Ensure-valid-vehicle-status.patch')
| -rw-r--r-- | patches/server/0628-Ensure-valid-vehicle-status.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0628-Ensure-valid-vehicle-status.patch b/patches/server/0628-Ensure-valid-vehicle-status.patch new file mode 100644 index 0000000000..544ee62764 --- /dev/null +++ b/patches/server/0628-Ensure-valid-vehicle-status.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke <[email protected]> +Date: Tue, 28 Sep 2021 09:47:47 +0200 +Subject: [PATCH] Ensure valid vehicle status + + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 5a13975fc9a472308ee74401f7b1f84f716e46eb..a94b43df4a6cd6f5974015bc5fc87d37347276f1 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -567,7 +567,7 @@ public class ServerPlayer extends Player { + } + } + +- if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger()) { ++ if (persistVehicle && entity1 != null && entity != this && entity.hasExactlyOnePlayerPassenger() && !entity.isRemoved()) { // Paper - Ensure valid vehicle status + // CraftBukkit end + CompoundTag nbttagcompound2 = new CompoundTag(); + CompoundTag nbttagcompound3 = new CompoundTag(); |