Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
2 changed files with 15 additions and 1 deletions
Showing only changes of commit 786ddf53c6 - Show all commits

View File

@@ -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);

View File

@@ -50,7 +50,12 @@ public abstract class CraftBlockEntityState<T extends BlockEntity> extends Craft
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);
throw new RuntimeException(
world == null
? "Failed to read non-placed BlockState"
: "Failed to read BlockState at: world: " + world.getName() + " location: (" + this.getX() + ", " + this.getY() + ", " + this.getZ() + ")",
thr
);
}
// Paper end - Show blockstate location if we failed to read it
}