From e5eb2771106451ef4bcf6bb3f8f728591b64fb59 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Mon, 16 Sep 2024 01:19:09 -0700
Subject: [PATCH] Fix rogue events warning

---
 .../emu/lunarcore/data/ResourceLoader.java     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java
index dc753f7..6e52bf7 100644
--- a/src/main/java/emu/lunarcore/data/ResourceLoader.java
+++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java
@@ -355,14 +355,15 @@ public class ResourceLoader {
     private static void loadRogueDialogueEvent() {
         // Loaded configs count
         int count = 0;
+        
         // Load dialogue event configs
         for (var npcEventExcel : GameData.getRogueNPCExcelMap().values()) {
-
             // Get file
             if (npcEventExcel.getNPCJsonPath().isEmpty()) {
                 count++;
                 continue;
             }
+            
             File file = new File(LunarCore.getConfig().getResourceDir() + "/" + npcEventExcel.getNPCJsonPath());
             if (!file.exists()) {
                 continue;
@@ -375,16 +376,22 @@ public class ResourceLoader {
                 // Load dialogue option
                 for (var dialogue : info.DialogueList) {
                     if (dialogue.getOptionPath() == null) {
-                        count++;
                         continue;
                     }
+                    
                     File optionFile = new File(LunarCore.getConfig().getResourceDir() + "/" + dialogue.getOptionPath());
                     if (!file.exists()) {
                         continue;
                     }
-                    RogueDialogueEventConfigInfo optionInfo = gson.fromJson(new FileReader(optionFile), RogueDialogueEventConfigInfo.class);
-                    dialogue.setOptionInfo(optionInfo);
+                    
+                    try (FileReader optionFileReader = new FileReader(optionFile)) {
+                        RogueDialogueEventConfigInfo optionInfo = gson.fromJson(optionFileReader, RogueDialogueEventConfigInfo.class);
+                        dialogue.setOptionInfo(optionInfo);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
+                
                 count++;
             } catch (Exception e) {
                 e.printStackTrace();
@@ -392,9 +399,10 @@ public class ResourceLoader {
         }
 
         // Notify the server owner if we are missing any files
-        if (count < GameData.getRogueDialogueEventList().size()) {
+        if (count < GameData.getRogueNPCExcelMap().size()) {
             LunarCore.getLogger().warn("Rogue dialogue event configs are missing, please check your resources folder: {resources}/Config/Level/Rogue/. Rogue event may not work!");
         }
+        
         // Done
         LunarCore.getLogger().info("Loaded " + count + " rogue events.");
     }