From 9ef5babc597ae748128e1974300dd98f9f8b1d57 Mon Sep 17 00:00:00 2001 From: Taiyou06 Date: Sun, 23 Mar 2025 21:45:33 +0100 Subject: [PATCH] remove the NPE fix for the time being --- ...ing.patch => 0156-AsyncBlockFinding.patch} | 0 .../0156-fix-NPE-on-MultifaceSpreader.patch | 40 ------------------- ...57-Direct-iteration-on-Sensing.tick.patch} | 0 3 files changed, 40 deletions(-) rename leaf-server/minecraft-patches/features/{0157-AsyncBlockFinding.patch => 0156-AsyncBlockFinding.patch} (100%) delete mode 100644 leaf-server/minecraft-patches/features/0156-fix-NPE-on-MultifaceSpreader.patch rename leaf-server/minecraft-patches/features/{0158-Direct-iteration-on-Sensing.tick.patch => 0157-Direct-iteration-on-Sensing.tick.patch} (100%) diff --git a/leaf-server/minecraft-patches/features/0157-AsyncBlockFinding.patch b/leaf-server/minecraft-patches/features/0156-AsyncBlockFinding.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0157-AsyncBlockFinding.patch rename to leaf-server/minecraft-patches/features/0156-AsyncBlockFinding.patch diff --git a/leaf-server/minecraft-patches/features/0156-fix-NPE-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0156-fix-NPE-on-MultifaceSpreader.patch deleted file mode 100644 index 9064789a..00000000 --- a/leaf-server/minecraft-patches/features/0156-fix-NPE-on-MultifaceSpreader.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Taiyou06 -Date: Sat, 22 Mar 2025 21:23:45 +0100 -Subject: [PATCH] fix NPE on MultifaceSpreader - - -diff --git a/net/minecraft/world/level/block/MultifaceSpreader.java b/net/minecraft/world/level/block/MultifaceSpreader.java -index 60f47334bb855d5216f57f888f131ba41f728d21..93ab8bbc7c76428d7fa3bb38567dd6f3f007d5f2 100644 ---- a/net/minecraft/world/level/block/MultifaceSpreader.java -+++ b/net/minecraft/world/level/block/MultifaceSpreader.java -@@ -10,6 +10,8 @@ import net.minecraft.world.level.BlockGetter; - import net.minecraft.world.level.LevelAccessor; - import net.minecraft.world.level.block.state.BlockState; - -+import static org.dreeam.leaf.config.LeafConfig.LOGGER; -+ - public class MultifaceSpreader { - public static final MultifaceSpreader.SpreadType[] DEFAULT_SPREAD_ORDER = new MultifaceSpreader.SpreadType[]{ - MultifaceSpreader.SpreadType.SAME_POSITION, MultifaceSpreader.SpreadType.SAME_PLANE, MultifaceSpreader.SpreadType.WRAP_AROUND -@@ -148,13 +150,19 @@ public class MultifaceSpreader { - } - - default boolean placeBlock(LevelAccessor level, MultifaceSpreader.SpreadPos pos, BlockState state, boolean markForPostprocessing) { -+ // Check for null -+ if (pos.source() == null || pos.pos() == null) { -+ LOGGER.warn("Invalid SpreadPos with null source or position: {}", pos); -+ return false; -+ } -+ - BlockState stateForPlacement = this.getStateForPlacement(state, level, pos.pos(), pos.face()); - if (stateForPlacement != null) { - if (markForPostprocessing) { - level.getChunk(pos.pos()).markPosForPostprocessing(pos.pos()); - } - -- return org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, pos.source(), pos.pos(), stateForPlacement, 2); // CraftBukkit -+ return org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, pos.source(), pos.pos(), stateForPlacement, 2); - } else { - return false; - } diff --git a/leaf-server/minecraft-patches/features/0158-Direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0157-Direct-iteration-on-Sensing.tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0158-Direct-iteration-on-Sensing.tick.patch rename to leaf-server/minecraft-patches/features/0157-Direct-iteration-on-Sensing.tick.patch