Skip to content

fix a couple edge case crashes #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maxpowa wants to merge 1 commit into from
Closed

fix a couple edge case crashes #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/main/java/alexiil/mc/lib/multipart/impl/MultipartBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,23 +114,25 @@ public BlockEntity createBlockEntity(BlockView var1) {

@Override
public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
BlockEntity be = view.getBlockEntity(pos);
if (be instanceof MultipartBlockEntity) {
MultipartBlockEntity container = (MultipartBlockEntity) be;
return container.container.getCollisionShape();
if (view != null) {
BlockEntity be = view.getBlockEntity(pos);
if (be instanceof MultipartBlockEntity) {
MultipartBlockEntity container = (MultipartBlockEntity) be;
return container.container.getCollisionShape();
}
}
return MISSING_PARTS_SHAPE;
}

@Override
public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
BlockEntity be = view.getBlockEntity(pos);
if (be instanceof MultipartBlockEntity) {
if (be instanceof MultipartBlockEntity && view instanceof World) {
MultipartBlockEntity container = (MultipartBlockEntity) be;

if (LibMultiPart.isDrawingBlockOutlines.getAsBoolean()) {
Vec3d hitVec = MinecraftClient.getInstance().crosshairTarget.getPos();
return getPartOutlineShape(state, (World) view, pos, hitVec);
return getPartOutlineShape(state, (World)view, pos, hitVec);
}

return container.container.getOutlineShape();
Expand Down