aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2020-01-03 03:49:09 +0100
committerGitHub <noreply@github.com>2020-01-03 03:49:09 +0100
commit0dd0b5fb5a508786d7a432ef2be91fd10b799cc3 (patch)
treee720d041afc59529900e3feaed1de217169c5c2a /src/main/java/gregtech/common
parentbb86e392220e8cbc85cc932548064d6db59120e2 (diff)
downloadGT5-Unofficial-0dd0b5fb5a508786d7a432ef2be91fd10b799cc3.tar.gz
GT5-Unofficial-0dd0b5fb5a508786d7a432ef2be91fd10b799cc3.tar.bz2
GT5-Unofficial-0dd0b5fb5a508786d7a432ef2be91fd10b799cc3.zip
Nikolite & Miner Fixes (#230)
+ Fixed gt recipes not working for Electrotine + Fixed Miner loading with "0" chunks when placed down + Version increase Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
index 22bb275ea2..b1fe243374 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
@@ -260,15 +260,19 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
drillX = aNBT.getInteger("drillX");
drillY = aNBT.getInteger("drillY");
drillZ = aNBT.getInteger("drillZ");
- radiusConfig = aNBT.getInteger("radiusConfig");
+ if (aNBT.hasKey("radiusConfig"))
+ radiusConfig = aNBT.getInteger("radiusConfig");
}
private FakePlayer mFakePlayer = null;
protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) {
- if (mFakePlayer == null) mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
- mFakePlayer.setWorld(aBaseTile.getWorld());
- mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
+ if (mFakePlayer == null)
+ mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
+ if (mFakePlayer != null) {
+ mFakePlayer.setWorld(aBaseTile.getWorld());
+ mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
+ }
return mFakePlayer;
}