From f3ad63aad10cbe4bec8953eddb987e72e9284d88 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Oct 2023 18:49:03 +1100 Subject: [PATCH] SPIGOT-7506: SculkBloomEvent.getBlock() world is null --- .../net/minecraft/world/level/block/SculkSpreader.patch | 2 +- .../level/block/entity/SculkCatalystBlockEntity.patch | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nms-patches/net/minecraft/world/level/block/SculkSpreader.patch b/nms-patches/net/minecraft/world/level/block/SculkSpreader.patch index 5bf2ebb7f..f7fdd0b5b 100644 --- a/nms-patches/net/minecraft/world/level/block/SculkSpreader.patch +++ b/nms-patches/net/minecraft/world/level/block/SculkSpreader.patch @@ -19,7 +19,7 @@ private final int additionalDecayRate; private List cursors = new ArrayList(); private static final Logger LOGGER = LogUtils.getLogger(); -+ World level; // CraftBukkit ++ public World level; // CraftBukkit public SculkSpreader(boolean flag, TagKey tagkey, int i, int j, int k, int l) { this.isWorldGeneration = flag; diff --git a/nms-patches/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.patch b/nms-patches/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.patch index 18579c8be..4044ba6f0 100644 --- a/nms-patches/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.patch +++ b/nms-patches/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.patch @@ -19,7 +19,7 @@ this.catalystListener.sculkSpreader.load(nbttagcompound); } -@@ -60,6 +64,7 @@ +@@ -60,11 +64,13 @@ final SculkSpreader sculkSpreader; private final IBlockData blockState; private final PositionSource positionSource; @@ -27,3 +27,9 @@ public CatalystListener(IBlockData iblockdata, PositionSource positionsource) { this.blockState = iblockdata; + this.positionSource = positionsource; + this.sculkSpreader = SculkSpreader.createLevelSpreader(); ++ this.sculkSpreader.level = level; // CraftBukkit + } + + @Override