core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/patches/server/0742-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
Remove old redundant fix (#8530)
2022-11-03 21:03:31 +00:00
index ffee74216d6ba1742e97400a7177725766bb557e..e761e01a02e2bc1f13bf88163f9cc55849031155 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
Rewrite chunk system (#8177) Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
2022-09-26 08:02:51 +00:00
@@ -498,7 +498,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();