Sfoglia il codice sorgente

Merge pull request #4078 from Ineusia/master

Missing Section Error Messages (Repair & Salvage Config)
Robert Alan Chapton 5 anni fa
parent
commit
9dcbccb010

+ 6 - 0
src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.config.skills.repair;
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.skills.ItemType;
 import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 import com.gmail.nossr50.util.ItemUtils;
@@ -26,6 +27,11 @@ public class RepairConfig extends ConfigLoader {
     protected void loadKeys() {
         repairables = new ArrayList<Repairable>();
 
+        if (!config.isConfigurationSection("Repairables")) {
+            mcMMO.p.getLogger().severe("Could not find Repairables section in " + fileName);
+            return;
+        }
+
         ConfigurationSection section = config.getConfigurationSection("Repairables");
         Set<String> keys = section.getKeys(false);
 

+ 6 - 0
src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.config.skills.salvage;
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.skills.ItemType;
 import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
 import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
 import com.gmail.nossr50.util.ItemUtils;
@@ -27,6 +28,11 @@ public class SalvageConfig extends ConfigLoader {
     protected void loadKeys() {
         salvageables = new ArrayList<Salvageable>();
 
+        if (!config.isConfigurationSection("Salvageables")) {
+            mcMMO.p.getLogger().severe("Could not find Salvageables section in " + fileName);
+            return;
+        }
+
         ConfigurationSection section = config.getConfigurationSection("Salvageables");
         Set<String> keys = section.getKeys(false);