mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-28 22:47:53 +02: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.
48 lines
2.9 KiB
Diff
48 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 1 Jul 2020 03:12:06 -0400
|
|
Subject: [PATCH] Clean up duplicated GameProfile Properties
|
|
|
|
We had a bug where we accidently cloned properties resulting in skulls
|
|
growing to large sizes and preventing login.
|
|
|
|
This now automatically cleans up the extra properties.
|
|
|
|
diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
index b31741a9c3363e4288636ceff9b38c598a84aa43..46681f3fa63516aa750de11cf1dee17cb3734fcd 100644
|
|
--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
@@ -93,7 +93,8 @@ public final class NbtUtils {
|
|
for(String string2 : compoundTag.getAllKeys()) {
|
|
ListTag listTag = compoundTag.getList(string2, 10);
|
|
|
|
- for(int i = 0; i < listTag.size(); ++i) {
|
|
+ if (listTag.size() == 0) continue; // Paper - remove duplicate properties
|
|
+ for (int i = listTag.size() - 1; i < listTag.size(); ++i) { // Paper - remove duplicate properties
|
|
CompoundTag compoundTag2 = listTag.getCompound(i);
|
|
String string3 = compoundTag2.getString("Value");
|
|
if (compoundTag2.contains("Signature", 8)) {
|
|
diff --git a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
|
|
index 2fb1500e9d3202b6377bf4d8e50102a98f409148..72a0c7ad03b18c3156b4f3c7240f7551583f981c 100644
|
|
--- a/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/PlayerHeadItem.java
|
|
@@ -52,6 +52,18 @@ public class PlayerHeadItem extends StandingAndWallBlockItem {
|
|
});
|
|
// CraftBukkit start
|
|
} else {
|
|
+ // Paper start - clean up old duplicated properties
|
|
+ CompoundTag properties = nbt.getCompound("SkullOwner").getCompound("Properties");
|
|
+ for (String key : properties.getAllKeys()) {
|
|
+ net.minecraft.nbt.ListTag values = properties.getList(key, 10);
|
|
+ if (values.size() > 1) {
|
|
+ net.minecraft.nbt.Tag texture = values.get(values.size() - 1);
|
|
+ values = new net.minecraft.nbt.ListTag();
|
|
+ values.add(texture);
|
|
+ properties.put(key, values);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
net.minecraft.nbt.ListTag textures = nbt.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts
|
|
for (int i = 0; i < textures.size(); i++) {
|
|
if (textures.get(i) instanceof CompoundTag && !((CompoundTag) textures.get(i)).contains("Signature", 8) && ((CompoundTag) textures.get(i)).getString("Value").trim().isEmpty()) {
|