mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
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 0b1114ade26f3f2280e4485a8260045a2b343c1b..3db8f376f3a73256d13fd778bb1c80606e6712d9 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -557,7 +557,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 - Ensure valid vehicle status
|
|
// CraftBukkit end
|
|
CompoundTag nbttagcompound2 = new CompoundTag();
|
|
CompoundTag nbttagcompound3 = new CompoundTag();
|