20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
Diff
|
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
|
||
|
|
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();
|