From 3e3cea1a76247d518ee54d00ed9b727ea106aff3 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 28 Sep 2021 10:24:25 +0200 Subject: [PATCH] Ensure valid vehicle status (#6673) --- .../0808-Ensure-valid-vehicle-status.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 patches/server/0808-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0808-Ensure-valid-vehicle-status.patch b/patches/server/0808-Ensure-valid-vehicle-status.patch new file mode 100644 index 0000000000..7cf8d3d6cb --- /dev/null +++ b/patches/server/0808-Ensure-valid-vehicle-status.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +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 9e6342ac61bdccfde371674249a5d43c692358eb..cd4ccb208baebd74780443fc575f0ce5b745fdc8 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -509,7 +509,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 + // CraftBukkit end + CompoundTag nbttagcompound2 = new CompoundTag(); + CompoundTag nbttagcompound3 = new CompoundTag();