Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
7c2dc4b342
* finish implementing all adventure components in codecs * add some initial tests * Add round trip tests for text and translatable components * Add more round trip test data (score component is failing) * Add more round trip test data * Fix SCORE_COMPONENT_MAP_CODEC * Improve test failure messages * Add failure cases * Add a couple more test data * Make use of AdventureCodecs * Update patches after rebase * Squash changes into adventure patch * Fix AT formatting * update comment --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
44 Zeilen
2.5 KiB
Diff
44 Zeilen
2.5 KiB
Diff
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
|
|
index ccb1db9649dfded891b308c346a6aeb870b61ce2..65112ec3a6ea1c27f032477720ae74395523012b 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
|
|
@@ -32,9 +32,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
|
|
+ @Override
|
|
+ public void setLevel(Level level) {
|
|
+ super.setLevel(level);
|
|
+ this.catalystListener.sculkSpreader.level = level;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
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);
|
|
@@ -64,13 +71,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 - bad fix
|
|
}
|
|
|
|
@Override
|