2023-10-21 22:20:24 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
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
2024-04-25 00:36:49 +02:00
index faa708976469263093b673d756ac5570f3680236..81dd0aa6a90fd9dda9e7752f85b9cf4568e3b575 100644
2023-10-21 22:20:24 +02:00
--- a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
2024-04-25 00:36:49 +02:00
@@ -34,9 +34,16 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
2023-10-21 22:20:24 +02:00
public SculkCatalystBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.SCULK_CATALYST, pos, state);
this.catalystListener = new SculkCatalystBlockEntity.CatalystListener(state, new BlockPositionSource(pos));
2023-10-27 01:34:58 +02:00
- this.catalystListener.level = this.level; // CraftBukkit
2023-10-21 22:20:24 +02:00
}
2024-01-13 18:34:33 +01:00
+ // Paper start - Fix NPE in SculkBloomEvent world access
2023-10-21 22:20:24 +02:00
+ @Override
+ public void setLevel(Level level) {
+ super.setLevel(level);
+ this.catalystListener.sculkSpreader.level = level;
+ }
2024-01-13 18:34:33 +01:00
+ // Paper end - Fix NPE in SculkBloomEvent world access
2023-10-21 22:20:24 +02:00
+
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);
2024-04-25 00:36:49 +02:00
@@ -66,13 +73,12 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
2023-10-21 22:20:24 +02:00
final SculkSpreader sculkSpreader;
private final BlockState blockState;
private final PositionSource positionSource;
- private Level level; // CraftBukkit
public CatalystListener(BlockState state, PositionSource positionSource) {
this.blockState = state;
2023-10-26 23:56:40 +02:00
this.positionSource = positionSource;
this.sculkSpreader = SculkSpreader.createLevelSpreader();
- this.sculkSpreader.level = this.level; // CraftBukkit
2024-01-13 18:34:33 +01:00
+ // this.sculkSpreader.level = this.level; // CraftBukkit // Paper - Fix NPE in SculkBloomEvent world access
2023-10-26 23:56:40 +02:00
}
@Override