core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/patches/server/0770-Ensure-valid-vehicle-s...

20 lines
1.0 KiB
Diff
Raw Normal View History

Ensure valid vehicle status (#6673)
2021-09-28 08:24:25 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff64962b SPIGOT-7124: MapPalette.getColor(0) returns the wrong color CraftBukkit Changes: 8f3647242 SPIGOT-7127: /say doesn't work from console
2022-08-01 14:01:20 +00:00
From: Nassim Jahnke <nassim@njahnke.dev>
Ensure valid vehicle status (#6673)
2021-09-28 08:24:25 +00: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
Update modern forwarding to v3 (#8219)
2022-08-08 15:25:41 +00:00
index 951ccf3526dc2f5e4e2f16952036683ad132fbe0..97de35c614e1e9b0e825f9914173a3e1e0e53221 100644
Ensure valid vehicle status (#6673)
2021-09-28 08:24:25 +00:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
More more more more more more work
2022-07-27 21:32:15 +00:00
@@ -513,7 +513,7 @@ public class ServerPlayer extends Player {
Ensure valid vehicle status (#6673)
2021-09-28 08:24:25 +00: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();