Skip to content

fix(brew): prevent NPE in canBrew() method #23

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

Open
AlexAfanasov wants to merge 1 commit into
base: 1.20.1-legacy
Choose a base branch
from
Open

fix(brew): prevent NPE in canBrew() method #23

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
26 changes: 20 additions & 6 deletions common/src/main/java/net/satisfy/brewery/block/entity/BrewstationBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;

public class BrewstationBlockEntity extends BlockEntity implements ImplementedInventory, BlockEntityTicker<BrewstationBlockEntity> {
@NotNull
Expand Down Expand Up @@ -123,7 +120,7 @@ public void tick(Level level, BlockPos blockPos, BlockState blockState, Brewstat
soundTime = 0;
}
soundTime++;
if(timeToNextEvent == Integer.MIN_VALUE) setTimeToEvent();
if (timeToNextEvent == Integer.MIN_VALUE) setTimeToEvent();

BrewHelper.checkRunningEvents(this);

Expand Down Expand Up @@ -158,10 +155,27 @@ private boolean canBrew(@Nullable Recipe<?> recipe) {
if (recipe == null || this.level == null)
return false;
BlockState blockState = this.level.getBlockState(this.getBlockPos());

BlockPos ovenPos = BrewHelper.getBlock(ObjectRegistry.BREW_OVEN.get(), this.components, this.level);
if (ovenPos == null) {
return false;
}

BlockState ovenState = this.level.getBlockState(ovenPos);

boolean hasRequiredProps =
blockState.hasProperty(BlockStateRegistry.MATERIAL) &&
blockState.hasProperty(BlockStateRegistry.LIQUID) &&
ovenState.hasProperty(BlockStateRegistry.HEAT);

if (!hasRequiredProps) {
return false;
}

return recipe instanceof BrewingRecipe brewingRecipe &&
blockState.getValue(BlockStateRegistry.MATERIAL).getLevel() >= brewingRecipe.getMaterial().getLevel() &&
blockState.getValue(BlockStateRegistry.LIQUID) != Liquid.EMPTY &&
this.level.getBlockState(BrewHelper.getBlock(ObjectRegistry.BREW_OVEN.get(), this.components, this.level)).getValue(BlockStateRegistry.HEAT) != Heat.OFF;
ovenState.getValue(BlockStateRegistry.HEAT) != Heat.OFF;
}

private void brew(Recipe<?> recipe, RegistryAccess access) {
Expand Down