From 9eca09b4ad46b519e337838a4a6a7c0a378fb56d Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Tue, 12 May 2020 09:24:39 +0200
Subject: Fixed NPE during Worldgen

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 src/main/java/gregtech/api/GregTech_API.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/GregTech_API.java')

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;
         }
-- 
cgit