I _knew_ I had that mod skipping code in for a reason. Don't load For…

…estry's classes if Forestry isn't present, since it will crash
pkmnfrk · Oct 22, 2018 · 95a54fd · 95a54fd
1 parent ea367f9
commit 95a54fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/mike_caron/megacorp/impl/QuestManager.java b/src/main/java/com/mike_caron/megacorp/impl/QuestManager.java
@@ -70,11 +70,11 @@ private boolean loadQuests(Path root, Path url)
             if(json.has("mod"))
                 mod = json.get("mod").getAsString();
 
-            //if(!Loader.isModLoaded(mod))
-            //{
-            //    MegaCorpMod.logger.info("Skipping " + mod + " quests, because it's not loaded");
-            //
-            //}
+            if(!Loader.isModLoaded(mod))
+            {
+                MegaCorpMod.logger.debug("Skipping " + mod + " quests, because it's not loaded");
+                return true;
+            }
 
             if(json.has("quests"))
             {

diff --git a/src/main/resources/assets/megacorp/quests/forestry.json b/src/main/resources/assets/megacorp/quests/forestry.json
@@ -1,4 +1,5 @@
 {
+  "mod": "forestry",
   "factories": [
     "com.mike_caron.megacorp.impl.quests.Forestry$Tubes",
     "com.mike_caron.megacorp.impl.quests.Forestry$Bees"