diff options
author | DreamMasterXXL <dream-master@gmx.net> | 2020-05-12 19:22:59 +0200 |
---|---|---|
committer | DreamMasterXXL <dream-master@gmx.net> | 2020-05-12 19:22:59 +0200 |
commit | f5383f38c1659147ee978363101f95a4c503aec3 (patch) | |
tree | bbaa4d6b65ea893912ef73a622ae385106e1149c /src | |
parent | 29b0a93f91b4df98b121ead97b25f9b185d8f0b2 (diff) | |
parent | 9eca09b4ad46b519e337838a4a6a7c0a378fb56d (diff) | |
download | GT5-Unofficial-f5383f38c1659147ee978363101f95a4c503aec3.tar.gz GT5-Unofficial-f5383f38c1659147ee978363101f95a4c503aec3.tar.bz2 GT5-Unofficial-f5383f38c1659147ee978363101f95a4c503aec3.zip |
Merge branch 'experimental' into HEE-Bees
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 1cc19e7de4..932d267a34 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -389,7 +389,7 @@ public class GregTech_API { * @param aZ is the Z-Coord of the update causing Block */ public static boolean causeMachineUpdate(World aWorld, int aX, int aY, int aZ) { - if (!aWorld.isRemote) { + if (aWorld != null && !aWorld.isRemote) { //World might be null during Worldgen GT_Runnable_MachineBlockUpdate.setMachineUpdateValues(aWorld, aX, aY, aZ); return true; } |