From 903a40013243c2bf490c30b0298d48d44b9f4cbf Mon Sep 17 00:00:00 2001
From: Take Weiland <weiland@dezign.de>
Date: Mon, 27 Apr 2020 20:06:34 +0200
Subject: [PATCH] Fix BackgroundScanHandler crashing on servers (#6660)

---
 src/main/java/net/minecraftforge/fml/ModLoader.java             | 2 +-
 .../java/net/minecraftforge/fml/server/ServerModLoader.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/ModLoader.java b/src/main/java/net/minecraftforge/fml/ModLoader.java
index 69a2d642f2..f1a3805b94 100644
--- a/src/main/java/net/minecraftforge/fml/ModLoader.java
+++ b/src/main/java/net/minecraftforge/fml/ModLoader.java
@@ -291,7 +291,7 @@ public class ModLoader
         Bootstrap.register();
         dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, inputs, serverGenerators, clientGenerators, devToolGenerators, reportsGenerator, structureValidator);
         existingFileHelper = new ExistingFileHelper(existingPacks, structureValidator);
-        gatherAndInitializeMods(null);
+        gatherAndInitializeMods(() -> {});
         dispatchAndHandleError(LifecycleEventProvider.GATHERDATA, Runnable::run, null);
         dataGeneratorConfig.runAll();
     }
diff --git a/src/main/java/net/minecraftforge/fml/server/ServerModLoader.java b/src/main/java/net/minecraftforge/fml/server/ServerModLoader.java
index 7ad5c3312d..fb9ec30c84 100644
--- a/src/main/java/net/minecraftforge/fml/server/ServerModLoader.java
+++ b/src/main/java/net/minecraftforge/fml/server/ServerModLoader.java
@@ -42,7 +42,7 @@ public class ServerModLoader
         LogicalSidedProvider.setServer(()->dedicatedServer);
         LanguageHook.loadForgeAndMCLangs();
         try {
-            ModLoader.get().gatherAndInitializeMods(null);
+            ModLoader.get().gatherAndInitializeMods(() -> {});
             ModLoader.get().loadMods(Runnable::run, (a)->{}, (a)->{});
         } catch (LoadingFailedException e) {
             ServerModLoader.hasErrors = true;