From 2c15b6150ce97a94b3acebe9d5e6ce60af7f51ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 11:27:32 -0600 Subject: [PATCH] Lots of MOP guards. closes #41 --- .../botania/client/render/tile/RenderTileTinyPotato.java | 2 +- .../vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- src/main/java/vazkii/botania/common/item/ItemSextant.java | 2 +- .../botania/common/item/equipment/bauble/ItemMonocle.java | 2 +- .../common/item/equipment/bauble/ItemSwapRing.java | 2 +- .../java/vazkii/botania/common/item/lens/LensBounce.java | 2 +- .../vazkii/botania/common/item/lens/LensExplosive.java | 2 +- .../java/vazkii/botania/common/item/lens/LensFire.java | 2 +- .../vazkii/botania/common/item/lens/LensFirework.java | 2 +- .../java/vazkii/botania/common/item/lens/LensLight.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPaint.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPiston.java | 2 +- .../vazkii/botania/common/item/lens/LensRedirect.java | 2 +- .../java/vazkii/botania/common/item/lens/LensStorm.java | 2 +- .../java/vazkii/botania/common/item/lens/LensWarp.java | 2 +- .../java/vazkii/botania/common/item/lens/LensWeight.java | 2 +- .../vazkii/botania/common/item/relic/ItemLokiRing.java | 8 ++++---- .../vazkii/botania/common/item/rod/ItemExchangeRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemSmeltRod.java | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index b385e08b2..77499d6a9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -352,7 +352,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer list = getCursorList(stack); BlockPos origin = getOriginPos(stack); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index ab0e55b70..61f77f8d4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -395,7 +395,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int meta = getBlockMeta(stack); MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { BlockPos bPos = pos.getBlockPos(); Block targetBlock = null; int targetMeta = 0; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 1fe5bba52..21eac8fbb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -66,7 +66,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { IBlockState state = p.worldObj.getBlockState(pos.getBlockPos()); ItemStack blockStack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));