From 2c70e6ebc1e0e4eca8baaa34ec1b6fae564c5057 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sun, 19 Jun 2016 22:36:35 -0700 Subject: [PATCH] Accept null from IAltarComponent --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 8 ++++---- .../WayofTime/bloodmagic/api/altar/IAltarComponent.java | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 144cd88d..236e9604 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -122,7 +122,7 @@ public class BloodAltar implements IFluidHandler if (worldBlock.getBlock() instanceof IAltarComponent) { EnumAltarComponent component = ((IAltarComponent) worldBlock.getBlock()).getType(world, worldBlock.getState(), componentPos); - if (component != altarComponent.getComponent()) + if (component == null || component != altarComponent.getComponent()) return false; } else if (worldBlock.getBlock() != Utils.getBlockForComponent(altarComponent.getComponent())) { @@ -155,9 +155,9 @@ public class BloodAltar implements IFluidHandler if (worldBlock.getBlock() instanceof IAltarComponent) { EnumAltarComponent component = ((IAltarComponent) worldBlock.getBlock()).getType(world, worldBlock.getState(), componentPos); - if (component != altarComponent.getComponent()) + if (component == null || component != altarComponent.getComponent()) { - return new ImmutablePair(componentPos, altarComponent.getComponent()); + return Pair.of(componentPos, altarComponent.getComponent()); } } else if (worldBlock.getBlock() != Utils.getBlockForComponent(altarComponent.getComponent())) { @@ -167,7 +167,7 @@ public class BloodAltar implements IFluidHandler { if (world.isAirBlock(componentPos)) { - return new ImmutablePair(componentPos, altarComponent.getComponent()); + return Pair.of(componentPos, altarComponent.getComponent()); } } } diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java index 211baee4..9e711b00 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java @@ -4,7 +4,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; + public interface IAltarComponent { + @Nullable EnumAltarComponent getType(World world, IBlockState state, BlockPos pos); }