Added error message for missing Salvageables section (rather than throw NPE)

This commit is contained in:
Ineusia 2019-11-08 01:15:32 -06:00
parent 7eab20ef56
commit ca1906fbc5

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);