From b077100667c1dee6e73da399e3484f92bbf67cb8 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 24 Apr 2022 17:25:47 +0100
Subject: Fix NPE caused by initialisation order on Forge/Fabric

---
 .../src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'spark-forge/src/main/java/me/lucko/spark')

diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
index 7805935..022b620 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
@@ -74,17 +74,18 @@ public abstract class ForgeSparkPlugin implements SparkPlugin {
     private final ForgeSparkMod mod;
     private final Logger logger;
     protected final ScheduledExecutorService scheduler;
-    protected final SparkPlatform platform;
+
+    protected SparkPlatform platform;
     protected final ThreadDumper.GameThread threadDumper = new ThreadDumper.GameThread();
 
     protected ForgeSparkPlugin(ForgeSparkMod mod) {
         this.mod = mod;
         this.logger = LogManager.getLogger("spark");
         this.scheduler = Executors.newScheduledThreadPool(4, new SparkThreadFactory());
-        this.platform = new SparkPlatform(this);
     }
 
     public void enable() {
+        this.platform = new SparkPlatform(this);
         this.platform.enable();
     }
 
-- 
cgit