diff options
| author | John <Techlone@users.noreply.github.com> | 2017-04-16 02:18:17 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 02:18:17 +0500 |
| commit | bd1ca056d63fe0ac2c3a8478c78183eafea92096 (patch) | |
| tree | 9c75a11959a6479e27ebc4a6e5818dcc48218e1d /src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java | |
| parent | 88128f31146c9f3fa1f5159fbc1252cb2d79f915 (diff) | |
| parent | 2ee3b7e712413604549af3097fda93cbb22a262e (diff) | |
| download | GT5-Unofficial-bd1ca056d63fe0ac2c3a8478c78183eafea92096.tar.gz GT5-Unofficial-bd1ca056d63fe0ac2c3a8478c78183eafea92096.tar.bz2 GT5-Unofficial-bd1ca056d63fe0ac2c3a8478c78183eafea92096.zip | |
Merge pull request #14 from Blood-Asp/unstable
Update
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java | 1 |
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)); |