Paper/patches/server/0702-Ensure-valid-vehicle-status.patch

20 Zeilen
1.0 KiB
Diff

2021-09-28 10:24:25 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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
index 3fdf2908d0f6ac994fa05e285d7bc365890964ac..b5b86613aea368c524ed2544b9836a834ed833ad 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
@@ -569,7 +569,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();