From f56eca23fc6fac9056d0af86e8ee5171f2e05a6d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 11:24:00 -0500 Subject: [PATCH] Fix #330 --- .../client/core/handler/ColorHandler.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 4483d28d7..03821405c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -25,6 +25,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.awt.*; import java.util.Map; @@ -81,13 +82,15 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - TileEntity tile = world.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState camoState = camo.camoState; - if(camoState != null) - return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + public int colorMultiplier(@Nonnull IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) { + if (world != null && pos != null) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + } } return 0xFFFFFF; }