From 036e0270f02bbd92e65adde017d3c2a55e43b48c Mon Sep 17 00:00:00 2001 From: Eclipse Date: Sun, 16 Jun 2024 23:14:32 +0000 Subject: [PATCH] Read sound event objects properly in jukebox song --- .../main/java/org/geysermc/geyser/level/JukeboxSong.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java b/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java index fd6ce693d..a85862bf6 100644 --- a/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java +++ b/core/src/main/java/org/geysermc/geyser/level/JukeboxSong.java @@ -33,7 +33,13 @@ public record JukeboxSong(String soundEvent, String description) { public static JukeboxSong read(RegistryEntry entry) { NbtMap data = entry.getData(); - String soundEvent = data.getString("sound_event"); + Object soundEventObject = data.get("sound_event"); + String soundEvent = ""; + if (soundEventObject instanceof NbtMap map) { + soundEvent = map.getString("sound_id"); + } else if (soundEventObject instanceof String string){ + soundEvent = string; + } String description = MessageTranslator.deserializeDescription(data); return new JukeboxSong(soundEvent, description); }