Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 04:17:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE for Jukebox#setRecord

Browse Source 
Fallback to the global registry if no level exists
This commit is contained in:
Jake Potrebic 2024-06-17 17:41:09 -07:00
parent 164078cd2a
commit d9e3bee3b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch
View File

@ -78,7 +78,7 @@
+ public void setSongItemWithoutPlaying(ItemStack itemstack, long ticksSinceSongStarted) { // CraftBukkit - add argument + public void setSongItemWithoutPlaying(ItemStack itemstack, long ticksSinceSongStarted) { // CraftBukkit - add argument
+ this.item = itemstack; + this.item = itemstack;
+ this.jukeboxSongPlayer.song = null; // CraftBukkit - reset + 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 + this.jukeboxSongPlayer.setSongWithoutPlaying(holder, ticksSinceSongStarted); // CraftBukkit - add argument
}); });
- this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock()); - this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());