Merge pull request #4078 from Ineusia/master

Missing Section Error Messages (Repair & Salvage Config)
This commit is contained in:
Robert Alan Chapton 2019-11-10 18:18:12 -08:00 committed by GitHub
commit 9dcbccb010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View File

@ -3,6 +3,7 @@ package com.gmail.nossr50.config.skills.repair;
import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.datatypes.skills.ItemType; import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType; 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.Repairable;
import com.gmail.nossr50.skills.repair.repairables.RepairableFactory; import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.util.ItemUtils;
@ -26,6 +27,11 @@ public class RepairConfig extends ConfigLoader {
protected void loadKeys() { protected void loadKeys() {
repairables = new ArrayList<Repairable>(); 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"); ConfigurationSection section = config.getConfigurationSection("Repairables");
Set<String> keys = section.getKeys(false); Set<String> keys = section.getKeys(false);

View File

@ -3,6 +3,7 @@ package com.gmail.nossr50.config.skills.salvage;
import com.gmail.nossr50.config.ConfigLoader; import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.datatypes.skills.ItemType; import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType; 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.Salvageable;
import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory; import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.util.ItemUtils;
@ -27,6 +28,11 @@ public class SalvageConfig extends ConfigLoader {
protected void loadKeys() { protected void loadKeys() {
salvageables = new ArrayList<Salvageable>(); 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"); ConfigurationSection section = config.getConfigurationSection("Salvageables");
Set<String> keys = section.getKeys(false); Set<String> keys = section.getKeys(false);