2021-09-28 10:24:25 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-08-01 16:01:20 +02:00
|
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
2021-09-28 10:24:25 +02: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-11-03 22:03:31 +01:00
|
|
|
index ffee74216d6ba1742e97400a7177725766bb557e..e761e01a02e2bc1f13bf88163f9cc55849031155 100644
|
2021-09-28 10:24:25 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2022-09-26 10:02:51 +02:00
|
|
|
@@ -498,7 +498,7 @@ public class ServerPlayer extends Player {
|
2021-09-28 10:24:25 +02: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();
|