mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-12 16:27:45 +00:00
Merge pull request #40 from MikeLydeamore/master
Fixed NPE in CTM fixes #39 and #28
This commit is contained in:
commit
c3b1e879d1
2 files changed
+3
-1
No files matched your search
+1
-1
@@ -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"
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user