From 9a6370e1cda521f1a4506727794546727a809bdf Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 7 Nov 2022 21:45:53 +0800 Subject: Merge commit '46d2c64c4303bc007055268075ea9be4e9852e5e' into modularity --- .../main/java/me/shedaniel/rei/impl/common/init/CoreInitialization.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'runtime-engine/initialization/src/main') diff --git a/runtime-engine/initialization/src/main/java/me/shedaniel/rei/impl/common/init/CoreInitialization.java b/runtime-engine/initialization/src/main/java/me/shedaniel/rei/impl/common/init/CoreInitialization.java index fc6304272..22cad60d2 100644 --- a/runtime-engine/initialization/src/main/java/me/shedaniel/rei/impl/common/init/CoreInitialization.java +++ b/runtime-engine/initialization/src/main/java/me/shedaniel/rei/impl/common/init/CoreInitialization.java @@ -42,6 +42,7 @@ import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry; import me.shedaniel.rei.impl.client.init.CoreClientInitialization; import me.shedaniel.rei.impl.common.InternalLogger; import me.shedaniel.rei.impl.common.Internals; +import net.minecraft.client.Minecraft; import net.minecraft.server.packs.PackType; import net.minecraft.util.Unit; import org.apache.commons.lang3.mutable.MutableLong; @@ -99,6 +100,7 @@ public class CoreInitialization { } public static void reloadPlugins(MutableLong lastReload, @Nullable ReloadStage start) { + if (Minecraft.getInstance().level == null) return; if (lastReload != null) { if (lastReload.getValue() > 0 && System.currentTimeMillis() - lastReload.getValue() <= 5000) { InternalLogger.getInstance().warn("Suppressing Reload Plugins of stage " + start); -- cgit