Skip to content

Commit

Permalink
Non-solid block crash fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@crispytwig
crispytwig committed Sep 19, 2024
1 parent 7c78af8 commit 299cde6
Showing 1 changed file with 30 additions and 29 deletions.
59 changes: 30 additions & 29 deletions src/main/java/com/starfish_studios/bbb/block/FrameBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,47 +246,47 @@ public boolean isPathfindable(BlockState state, BlockGetter level, BlockPos pos,
}

public BlockState getConnections(BlockState state, LevelAccessor level, BlockPos pos) {
boolean n = validConnection(level.getBlockState(pos.north()));
boolean e = validConnection(level.getBlockState(pos.east()));
boolean s = validConnection(level.getBlockState(pos.south()));
boolean w = validConnection(level.getBlockState(pos.west()));
boolean t = validConnection(level.getBlockState(pos.above()));
boolean b = validConnection(level.getBlockState(pos.below()));
boolean n = validConnection(level.getBlockState(pos.north()), level, pos.north());
boolean e = validConnection(level.getBlockState(pos.east()), level, pos.east());
boolean s = validConnection(level.getBlockState(pos.south()), level, pos.south());
boolean w = validConnection(level.getBlockState(pos.west()), level, pos.west());
boolean t = validConnection(level.getBlockState(pos.above()), level, pos.above());
boolean b = validConnection(level.getBlockState(pos.below()), level, pos.below());
if (state.getValue(FACING) == Direction.NORTH) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !e || !validConnection(level.getBlockState(pos.east()));
boolean right = !w || !validConnection(level.getBlockState(pos.west()));
boolean top = !t || !validConnection(level.getBlockState(pos.above()), level, pos.above());
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()), level, pos.below());
boolean left = !e || !validConnection(level.getBlockState(pos.east()), level, pos.east());
boolean right = !w || !validConnection(level.getBlockState(pos.west()), level, pos.west());
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.EAST) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !s || !validConnection(level.getBlockState(pos.south()));
boolean right = !n || !validConnection(level.getBlockState(pos.north()));
boolean top = !t || !validConnection(level.getBlockState(pos.above()), level, pos.above());
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()), level, pos.below());
boolean left = !s || !validConnection(level.getBlockState(pos.south()), level, pos.south());
boolean right = !n || !validConnection(level.getBlockState(pos.north()), level, pos.north());
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.SOUTH) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !w || !validConnection(level.getBlockState(pos.west()));
boolean right = !e || !validConnection(level.getBlockState(pos.east()));
boolean top = !t || !validConnection(level.getBlockState(pos.above()), level, pos.above());
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()), level, pos.below());
boolean left = !w || !validConnection(level.getBlockState(pos.west()), level, pos.west());
boolean right = !e || !validConnection(level.getBlockState(pos.east()), level, pos.east());
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.WEST) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !n || !validConnection(level.getBlockState(pos.north()));
boolean right = !s || !validConnection(level.getBlockState(pos.south()));
boolean top = !t || !validConnection(level.getBlockState(pos.above()), level, pos.above());
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()), level, pos.below());
boolean left = !n || !validConnection(level.getBlockState(pos.north()), level, pos.north());
boolean right = !s || !validConnection(level.getBlockState(pos.south()), level, pos.south());
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
Expand All @@ -296,15 +296,16 @@ public BlockState getConnections(BlockState state, LevelAccessor level, BlockPos
return state;
}

public boolean validConnection(BlockState state) {
if (state.isFaceSturdy(null, null, Direction.UP) ||
state.isFaceSturdy(null, null, Direction.DOWN) ||
state.isFaceSturdy(null, null, Direction.NORTH) ||
state.isFaceSturdy(null, null, Direction.EAST) ||
state.isFaceSturdy(null, null, Direction.SOUTH) ||
state.isFaceSturdy(null, null, Direction.WEST)) {
public boolean validConnection(BlockState state, BlockGetter getter, BlockPos pos) {
if (state.isFaceSturdy(getter, pos, Direction.UP) ||
state.isFaceSturdy(getter, pos, Direction.DOWN) ||
state.isFaceSturdy(getter, pos, Direction.NORTH) ||
state.isFaceSturdy(getter, pos, Direction.EAST) ||
state.isFaceSturdy(getter, pos, Direction.SOUTH) ||
state.isFaceSturdy(getter, pos, Direction.WEST)) {
return true;
}

return state.is(BBBTags.BBBBlockTags.FRAMES) || state.is(BBBTags.BBBBlockTags.STONE_FRAMES);
}
}

0 comments on commit 299cde6

Please sign in to comment.