2021-09-28 08:24:25 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-08-01 14:01:20 +00:00
|
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
2021-09-28 08:24:25 +00:00
|
|
|
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
|
2022-07-27 21:32:15 +00:00
|
|
|
index 62f2c9645a3bf5b2bfd9fe99d3e6ec08c7dafa9a..e243e67ff389014b2b1a80fa20e67996fae48f8d 100644
|
2021-09-28 08:24:25 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2022-07-27 21:32:15 +00:00
|
|
|
@@ -513,7 +513,7 @@ public class ServerPlayer extends Player {
|
2021-09-28 08:24:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- 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();
|