diff options
| author | Jake Potrebic <[email protected]> | 2024-06-17 17:42:48 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-06-17 17:44:04 -0700 |
| commit | b4b820851f5291c467b1a9590750a10ec67af4f6 (patch) | |
| tree | f7b01eb08b206a283b1ff73e08a1ae4109a63375 | |
| parent | b9f709872393eda399b3b723ff7241cc2c1beba1 (diff) | |
| download | Paper-b4b820851f5291c467b1a9590750a10ec67af4f6.tar.gz Paper-b4b820851f5291c467b1a9590750a10ec67af4f6.zip | |
Fix NPE for Jukebox#setRecord
Fallback to the global registry if no level exists
Fixes #10899
| -rw-r--r-- | patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch new file mode 100644 index 0000000000..e15a77ee75 --- /dev/null +++ b/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Mon, 17 Jun 2024 17:41:09 -0700 +Subject: [PATCH] Fix NPE for Jukebox#setRecord + +Fallback to the global registry if no level exists + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java +index 1497e76b548ad76b5aaa297bdd35723e6a8f1f8d..c5069730b25e6f0dfb4e5db3271c91116b485f58 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java +@@ -200,7 +200,7 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai + public void setSongItemWithoutPlaying(ItemStack itemstack, long ticksSinceSongStarted) { // CraftBukkit - add argument + this.item = itemstack; + this.jukeboxSongPlayer.song = null; // CraftBukkit - reset +- JukeboxSong.fromStack(this.level.registryAccess(), itemstack).ifPresent((holder) -> { ++ JukeboxSong.fromStack(this.level != null ? this.level.registryAccess() : org.bukkit.craftbukkit.CraftRegistry.getMinecraftRegistry(), itemstack).ifPresent((holder) -> { // Paper - fallback to other RegistyrAccess if no level + this.jukeboxSongPlayer.setSongWithoutPlaying(holder, ticksSinceSongStarted); // CraftBukkit - add argument + }); + // CraftBukkit start - add null check for level |