1 files changed, 43 insertions, 0 deletions
diff --git a/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch
new file mode 100644
index 0000000000..3f575aef28
--- /dev/null
+++ b/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lulu13022002 <[email protected]>
+Date: Fri, 20 Oct 2023 19:50:22 +0200
+Subject: [PATCH] Fix NPE in SculkBloomEvent world access
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+index faa708976469263093b673d756ac5570f3680236..81dd0aa6a90fd9dda9e7752f85b9cf4568e3b575 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+@@ -34,9 +34,16 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
+     public SculkCatalystBlockEntity(BlockPos pos, BlockState state) {
+         super(BlockEntityType.SCULK_CATALYST, pos, state);
+         this.catalystListener = new SculkCatalystBlockEntity.CatalystListener(state, new BlockPositionSource(pos));
+-        this.catalystListener.level = this.level; // CraftBukkit
+     }
+ 
++    // Paper start - Fix NPE in SculkBloomEvent world access
++    @Override
++    public void setLevel(Level level) {
++        super.setLevel(level);
++        this.catalystListener.sculkSpreader.level = level;
++    }
++    // Paper end - Fix NPE in SculkBloomEvent world access
++
+     public static void serverTick(Level world, BlockPos pos, BlockState state, SculkCatalystBlockEntity blockEntity) {
+         org.bukkit.craftbukkit.event.CraftEventFactory.sourceBlockOverride = blockEntity.getBlockPos(); // CraftBukkit - SPIGOT-7068: Add source block override, not the most elegant way but better than passing down a BlockPosition up to five methods deep.
+         blockEntity.catalystListener.getSculkSpreader().updateCursors(world, pos, world.getRandom(), true);
+@@ -66,13 +73,12 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
+         final SculkSpreader sculkSpreader;
+         private final BlockState blockState;
+         private final PositionSource positionSource;
+-        private Level level; // CraftBukkit
+ 
+         public CatalystListener(BlockState state, PositionSource positionSource) {
+             this.blockState = state;
+             this.positionSource = positionSource;
+             this.sculkSpreader = SculkSpreader.createLevelSpreader();
+-            this.sculkSpreader.level = this.level; // CraftBukkit
++            // this.sculkSpreader.level = this.level; // CraftBukkit // Paper - Fix NPE in SculkBloomEvent world access
+         }
+ 
+         @Override