Skip to content

Commit 14f7df3

Browse files
authored
Properly fix potential NPE in MetaTileEntity (GregTechCEu#2748)
1 parent d1c7382 commit 14f7df3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
import net.minecraftforge.fluids.FluidUtil;
7373
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
7474
import net.minecraftforge.fluids.capability.IFluidHandler;
75-
import net.minecraftforge.fml.common.FMLCommonHandler;
7675
import net.minecraftforge.fml.common.Optional.Method;
7776
import net.minecraftforge.fml.relauncher.Side;
7877
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -847,8 +846,8 @@ private void updateLightValue() {
847846
}
848847

849848
public void update() {
850-
if (!getWorld().isRemote && !allowTickAcceleration()) {
851-
int currentTick = FMLCommonHandler.instance().getMinecraftServerInstance().getTickCounter();
849+
if (!allowTickAcceleration() && getWorld().getMinecraftServer() != null) {
850+
int currentTick = getWorld().getMinecraftServer().getTickCounter();
852851
if (currentTick == lastTick) {
853852
return;
854853
}

0 commit comments

Comments
 (0)