3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-14 10:30:07 +01:00
Paper/patches/server/0609-Ensure-valid-vehicle-status.patch

20 Zeilen
1.1 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
2024-10-23 22:10:14 +02:00
index d2fbbdbb451d6c54d847b4ba125397ad41c4f7b4..f72ab5e4e743cb0758ebca28e81f97c143c91b42 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
2024-10-23 22:10:14 +02:00
@@ -698,7 +698,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.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 - Ensure valid vehicle status
2021-09-28 10:24:25 +02:00
// CraftBukkit end
2024-10-23 22:10:14 +02:00
CompoundTag nbttagcompound1 = new CompoundTag();
2021-09-28 10:24:25 +02:00
CompoundTag nbttagcompound2 = new CompoundTag();