SPIGOT-7308: Fix NullPointerException when calling Jukebox#setRecord()

2023-03-22 14:21:06 -04:00 · 2023-03-22 14:21:06 -04:00 · f5b61387e1
commit f5b61387e1
parent 388d458a61
1 changed files with 13 additions and 0 deletions
--- a/nms-patches/net/minecraft/world/level/block/entity/TileEntityJukeBox.patch
+++ b/nms-patches/net/minecraft/world/level/block/entity/TileEntityJukeBox.patch
@ -66,3 +66,16 @@
     }
 
     @Override
+@@ -203,7 +246,11 @@
+     @VisibleForTesting
+     public void setRecordWithoutPlaying(ItemStack itemstack) {
+         this.items.set(0, itemstack);
+-        this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());
+        // CraftBukkit start - add null check for level
+        if (level != null) {
+            this.level.updateNeighborsAt(this.getBlockPos(), this.getBlockState().getBlock());
+        }
+        // CraftBukkit end
+         this.setChanged();
+     }
+ }