aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-03-31 16:14:36 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2017-03-31 16:14:36 +0200
commitd725c463e5d134223fb4daf321d67babb1ca4de4 (patch)
tree27db477a397fd7a3ae0651aecd41481ba0614803 /src/main/java
parent1cf68bbcdf6725bbe6a125d83a116d0a7ebcc12b (diff)
downloadGT5-Unofficial-d725c463e5d134223fb4daf321d67babb1ca4de4.tar.gz
GT5-Unofficial-d725c463e5d134223fb4daf321d67babb1ca4de4.tar.bz2
GT5-Unofficial-d725c463e5d134223fb4daf321d67babb1ca4de4.zip
null check to prevent bukkit crash
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index baae25274d..cd133100db 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -147,6 +147,7 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
}
public void overrideOreBlockMaterial(Block aOverridingStoneBlock, byte aOverridingStoneMeta) {
+ if(this.worldObj == null || blockType==null)return;
this.mMetaData = ((short) (int) (this.mMetaData % 1000L + this.mMetaData / 16000L * 16000L));
if (aOverridingStoneBlock.isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.netherrack)) {
this.mMetaData = ((short) (this.mMetaData + 1000));