mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 04:02:06 -07:00
Default piston block entity direction to DOWN (#12039)
This commit is contained in:
@@ -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);
|
||||
|
@@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user