Fix SkullMeta configuration serialization / deserialization with note block sound

By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2023-11-09 07:28:25 +01:00
parent babc4636fa
commit 45bad8032d

View file

@ -98,10 +98,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
if (noteBlockSound == null) { if (noteBlockSound == null) {
Object object = map.get(NOTE_BLOCK_SOUND.BUKKIT); Object object = map.get(NOTE_BLOCK_SOUND.BUKKIT);
if (object instanceof NamespacedKey) { if (object != null) {
setNoteBlockSound((NamespacedKey) object); setNoteBlockSound(NamespacedKey.fromString(object.toString()));
} else {
setNoteBlockSound(SerializableMeta.getObject(NamespacedKey.class, map, NOTE_BLOCK_SOUND.BUKKIT, true));
} }
} }
} }
@ -305,7 +303,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
} }
NamespacedKey namespacedKeyNB = this.getNoteBlockSound(); NamespacedKey namespacedKeyNB = this.getNoteBlockSound();
if (namespacedKeyNB != null) { if (namespacedKeyNB != null) {
return builder.put(NOTE_BLOCK_SOUND.BUKKIT, namespacedKeyNB); return builder.put(NOTE_BLOCK_SOUND.BUKKIT, namespacedKeyNB.toString());
} }
return builder; return builder;
} }