Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00
Code Issues Projekte Releases Wiki Aktivität

#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures

Quellcode durchsuchen 
The underlying issue is a change by Mojang how UUID are stored in NBT.
This patch will have CraftBukkit convert the format during
deserialization.
Dieser Commit ist enthalten in:
SydMontague 2020-09-25 17:09:59 +10:00 committet von md_5
Ursprung f8d4da08e1
Commit 1dabfdc82f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: E8E901AC7C617C11
1 geänderte Dateien mit 9 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
Datei anzeigen

@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.inventory;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap.Builder;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import net.minecraft.server.GameProfileSerializer; import net.minecraft.server.GameProfileSerializer;
import net.minecraft.server.NBTBase; import net.minecraft.server.NBTBase;
import net.minecraft.server.NBTTagCompound; import net.minecraft.server.NBTTagCompound;
@ -59,7 +60,14 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
super.deserializeInternal(tag, context); super.deserializeInternal(tag, context);
if (tag.hasKeyOfType(SKULL_PROFILE.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) { if (tag.hasKeyOfType(SKULL_PROFILE.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
this.setProfile(GameProfileSerializer.deserialize(tag.getCompound(SKULL_PROFILE.NBT))); NBTTagCompound skullTag = tag.getCompound(SKULL_PROFILE.NBT);
// convert type of stored Id from String to UUID for backwards compatibility
if (skullTag.hasKeyOfType("Id", CraftMagicNumbers.NBT.TAG_STRING)) {
UUID uuid = UUID.fromString(skullTag.getString("Id"));
skullTag.a("Id", uuid);
}
this.setProfile(GameProfileSerializer.deserialize(skullTag));
} }
} }