Fix #11887

PaperMC · Jan 28, 2025 · daa4440 · daa4440
1 parent a392d47
commit daa4440
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...patches/sources/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java.patch b/...patches/sources/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java.patch
@@ -1,5 +1,14 @@
 --- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+@@ -35,7 +_,7 @@
+     private static final double PUSH_OFFSET = 0.01;
+     public static final double TICK_MOVEMENT = 0.51;
+     private BlockState movedState = Blocks.AIR.defaultBlockState();
+-    private Direction direction;
++    private Direction direction = Direction.DOWN; // Paper - default to first value to avoid NPE
+     private boolean extending;
+     private boolean isSourcePiston;
+     private static final ThreadLocal<Direction> NOCLIP = ThreadLocal.withInitial(() -> null);
 @@ -299,7 +_,7 @@
                  if (level.getBlockState(pos).is(Blocks.MOVING_PISTON)) {
                      BlockState blockState = Block.updateFromNeighbourShapes(blockEntity.movedState, level, pos);

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -50,7 +50,8 @@ public CraftBlockEntityState(World world, T tileEntity) {
             if (thr instanceof ThreadDeath) {
                 throw (ThreadDeath)thr;
             }
-            throw new RuntimeException("Failed to read BlockState at: world: " + this.getWorld().getName() + " location: (" + this.getX() + ", " + this.getY() + ", " + this.getZ() + ")", thr);
+            String worldName = world == null ? "null" : world.getName();
+            throw new RuntimeException("Failed to read BlockState at: world: " + worldName + " location: (" + this.getX() + ", " + this.getY() + ", " + this.getZ() + ")", thr);
         }
         // Paper end - Show blockstate location if we failed to read it
     }