2021-09-28 10:24:25 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Nassim Jahnke <jahnke.nassim@gmail.com>
|
|
|
|
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
|
2021-11-25 09:10:26 +01:00
|
|
|
index 67b482f6cafc55b6b262f23c2b56e4d8c6d089c2..510334bc98d2112489fcece46b660000b14ce6a5 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
|
2021-11-25 09:10:26 +01:00
|
|
|
@@ -487,7 +487,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();
|