From ef6b85807dc1e9ebbb8b1fc4a0654d4978f8247f Mon Sep 17 00:00:00 2001 From: Michael Lydeamore Date: Tue, 2 Dec 2014 10:13:12 +1030 Subject: [PATCH] Fixed NPE in CTM --- build.gradle | 2 +- src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7b74bc1b..aba98c79 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } apply plugin: 'forge' -version = "2.1.0.2" +version = "2.1.2" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel 2" diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java index aab5ff66..4c63058e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java @@ -284,6 +284,8 @@ public class CTM x2++; break; } + if (getBlockOrFacade(world, x2, y2, z2, side) == null || getBlockOrFacade(world, x, y, z, side) == null || block == null) + return false; return getBlockOrFacade(world, x, y, z, side).equals(block) && getBlockOrFacadeMetadata(world, x, y, z, side) == meta && (!getBlockOrFacade(world, x2, y2, z2, side).equals(block) || getBlockOrFacadeMetadata(world, x2, y2, z2, side) != meta); }