Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
654b792caf
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
69 Zeilen
4.0 KiB
Diff
69 Zeilen
4.0 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/server/GameProfileSerializer.java b/src/main/java/net/minecraft/server/GameProfileSerializer.java
|
|
index dca47422816e0ff5cf56ee73d0aa7e2f74a48060..1fe44d4a1a1895f5715c720f9d7d7acb10e50f61 100644
|
|
--- a/src/main/java/net/minecraft/server/GameProfileSerializer.java
|
|
+++ b/src/main/java/net/minecraft/server/GameProfileSerializer.java
|
|
@@ -47,8 +47,8 @@ public final class GameProfileSerializer {
|
|
while (iterator.hasNext()) {
|
|
String s1 = (String) iterator.next();
|
|
NBTTagList nbttaglist = nbttagcompound1.getList(s1, 10);
|
|
-
|
|
- for (int i = 0; i < nbttaglist.size(); ++i) {
|
|
+ if (nbttaglist.size() == 0) continue; // Paper - remove duplicate properties
|
|
+ for (int i = nbttaglist.size() - 1; i < nbttaglist.size(); ++i) { // Paper - remove duplicate properties
|
|
NBTTagCompound nbttagcompound2 = nbttaglist.getCompound(i);
|
|
String s2 = nbttagcompound2.getString("Value");
|
|
|
|
@@ -234,7 +234,7 @@ public final class GameProfileSerializer {
|
|
Optional<T> optional = iblockstate.b(nbttagcompound.getString(s));
|
|
|
|
if (optional.isPresent()) {
|
|
- return (IBlockDataHolder) s0.set(iblockstate, (Comparable) optional.get());
|
|
+ return s0.set(iblockstate, optional.get()); // Paper - decompile error
|
|
} else {
|
|
GameProfileSerializer.LOGGER.warn("Unable to read property: {} with value: {} for blockstate: {}", s, nbttagcompound.getString(s), nbttagcompound1.toString());
|
|
return s0;
|
|
@@ -264,8 +264,8 @@ public final class GameProfileSerializer {
|
|
return nbttagcompound;
|
|
}
|
|
|
|
- private static <T extends Comparable<T>> String a(IBlockState<T> iblockstate, Comparable<?> comparable) {
|
|
- return iblockstate.a(comparable);
|
|
+ private static <T extends Comparable<T>> String a(IBlockState<T> iblockstate, Comparable<T> comparable) {// Paper - decompile error
|
|
+ return iblockstate.a((T) comparable);// Paper - decompile error
|
|
}
|
|
|
|
public static NBTTagCompound a(DataFixer datafixer, DataFixTypes datafixtypes, NBTTagCompound nbttagcompound, int i) {
|
|
diff --git a/src/main/java/net/minecraft/server/ItemSkullPlayer.java b/src/main/java/net/minecraft/server/ItemSkullPlayer.java
|
|
index 28f1ce9031c73d09b55a5c6aac5d34e66e9f7c12..61f4cf9cc62a1b2ba59137b8682cb58834b4abcc 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemSkullPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemSkullPlayer.java
|
|
@@ -53,6 +53,18 @@ public class ItemSkullPlayer extends ItemBlockWallable {
|
|
return true;
|
|
} else {
|
|
// CraftBukkit start
|
|
+ // Paper start - clean up old duplicated properties
|
|
+ NBTTagCompound properties = nbttagcompound.getCompound("SkullOwner").getCompound("Properties");
|
|
+ for (String key : properties.getKeys()) {
|
|
+ NBTTagList values = properties.getList(key, 10);
|
|
+ if (values.size() > 1) {
|
|
+ NBTBase texture = values.get(values.size() - 1);
|
|
+ values = new NBTTagList();
|
|
+ values.add(texture);
|
|
+ properties.set(key, values);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
NBTTagList textures = nbttagcompound.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 NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8) && ((NBTTagCompound) textures.get(i)).getString("Value").trim().isEmpty()) {
|