From d82cfd4586b8f7ce990efa1aa578078c699ad92f Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Tue, 5 Dec 2023 22:03:30 -0800
Subject: [PATCH] Add a sanity check to prevent loading null configs

---
 src/main/java/emu/lunarcore/LunarCore.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/emu/lunarcore/LunarCore.java b/src/main/java/emu/lunarcore/LunarCore.java
index 1b6f1d6..3133c95 100644
--- a/src/main/java/emu/lunarcore/LunarCore.java
+++ b/src/main/java/emu/lunarcore/LunarCore.java
@@ -172,12 +172,20 @@ public class LunarCore {
     // Config
 
     public static void loadConfig() {
+        // Load from file
         try (FileReader file = new FileReader(configFile)) {
-            config = JsonUtils.loadToClass(file, Config.class);
+            LunarCore.config = JsonUtils.loadToClass(file, Config.class);
         } catch (Exception e) {
+            // Ignored
+        }
+        
+        // Sanity check
+        if (LunarCore.getConfig() == null) {
             LunarCore.config = new Config();
         }
-        saveConfig();
+        
+        // Save config
+        LunarCore.saveConfig();
     }
 
     public static void saveConfig() {