mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
01a13871de
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.
63 lines
3.7 KiB
Diff
63 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
Date: Sat, 26 Feb 2022 13:27:31 -0700
|
|
Subject: [PATCH] Add debug for invalid GameProfiles on skull blocks/items
|
|
|
|
Improves the error message for placed in world skull blocks by default,
|
|
also adds 'Paper.debugInvalidSkullProfiles' system property which can be
|
|
set to 'true' for extra debug info (trace of updateGameprofile caller).
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
|
|
index c5d5d90d10b30f30d1262367b3d75df43fbdb231..e017020b7630f54c506d93ab0504c6f3299fc80b 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
|
|
@@ -114,13 +114,28 @@ public class SkullBlockEntity extends BlockEntity {
|
|
updateGameprofile(this.owner, (owner) -> {
|
|
this.owner = owner;
|
|
this.setChanged();
|
|
+ // Paper start
|
|
+ }, () -> {
|
|
+ final @Nullable Level level = this.getLevel();
|
|
+ return "SkullBlockEntity at " + this.getBlockPos() + (level == null ? "" : (" in level: " + level.dimension().location()));
|
|
+ // Paper end
|
|
});
|
|
}
|
|
|
|
public static void updateGameprofile(@Nullable GameProfile owner, Consumer<GameProfile> callback) {
|
|
+ // Paper start
|
|
+ updateGameprofile(owner, callback, null);
|
|
+ }
|
|
+
|
|
+ private static final boolean DEBUG_INVALID_SKULL_PROFILES = Boolean.getBoolean("Paper.debugInvalidSkullProfiles");
|
|
+
|
|
+ public static void updateGameprofile(@Nullable GameProfile owner, Consumer<GameProfile> callback, final @Nullable java.util.function.Supplier<String> debugInfo) {
|
|
if (owner != null && !StringUtil.isNullOrEmpty(owner.getName()) && (!owner.isComplete() || !owner.getProperties().containsKey("textures")) && profileCache != null && sessionService != null) {
|
|
+ final @Nullable Throwable trace = DEBUG_INVALID_SKULL_PROFILES ? new Throwable("updateGameprofile caller debug trace") : null;
|
|
profileCache.getAsync(owner.getName(), (profile) -> {
|
|
Util.PROFILE_EXECUTOR.execute(() -> { // Paper - not a good idea to use BLOCKING OPERATIONS on the worldgen executor
|
|
+ try {
|
|
+ // Paper end
|
|
Util.ifElse(profile, (profilex) -> {
|
|
Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null);
|
|
if (property == null) {
|
|
@@ -137,6 +152,20 @@ public class SkullBlockEntity extends BlockEntity {
|
|
callback.accept(owner);
|
|
});
|
|
});
|
|
+ // Paper start
|
|
+ } catch (final Exception ex) {
|
|
+ if (trace != null) {
|
|
+ ex.addSuppressed(trace);
|
|
+ }
|
|
+ final String ownerMessage = "Original profile: '" + owner + "'";
|
|
+ final String debugMessage = " Run with -DPaper.debugInvalidSkullProfiles=true for further debug information.";
|
|
+ final String message = ownerMessage + (trace == null ? debugMessage : "");
|
|
+ if (debugInfo == null) {
|
|
+ throw new RuntimeException(message, ex);
|
|
+ }
|
|
+ throw new RuntimeException(debugInfo.get() + " " + message, ex);
|
|
+ }
|
|
+ // Paper end
|
|
});
|
|
});
|
|
} else {
|