From 3e9a0df7a15d13a8569420420b161d8711ff5cb5 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 15 Oct 2023 23:50:48 +0100 Subject: [PATCH] Spikes no longer pop off of honey blocks --- .../java/com/minelittlepony/unicopia/block/SpikesBlock.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java index aacb36e2..c24062c1 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java @@ -60,7 +60,7 @@ public class SpikesBlock extends OrientedBlock { Direction facing = state.get(FACING); pos = pos.offset(facing.getOpposite()); state = world.getBlockState(pos); - return state.isReplaceable() || state.isSideSolid(world, pos, facing, SideShapeType.FULL); + return state.isReplaceable() || state.isSideSolid(world, pos, facing, SideShapeType.FULL) || state.isOf(Blocks.HONEY_BLOCK); } @Override @@ -72,8 +72,7 @@ public class SpikesBlock extends OrientedBlock { @Deprecated @Override public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { - if (direction == state.get(FACING).getOpposite() && !neighborState.isSideSolid(world, neighborPos, direction, SideShapeType.FULL)) { - + if (direction == state.get(FACING).getOpposite() && !canPlaceAt(state, world, pos)) { if (!(neighborState.isOf(Blocks.STICKY_PISTON) || neighborState.isOf(Blocks.PISTON) || neighborState.isOf(Blocks.PISTON_HEAD)