Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Fixing an IllegalArgumentException related to custom repair configs."

Browse Source 
This reverts commit 3036d4fa90.
This commit is contained in:
NuclearW 2013-02-24 00:01:01 -05:00
parent 9759224690
commit 54ca6e78f5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/config/ConfigLoader.java
View File

@ -46,13 +46,7 @@ public abstract class ConfigLoader {
} }
config = YamlConfiguration.loadConfiguration(configFile); config = YamlConfiguration.loadConfiguration(configFile);
InputStream resource = plugin.getResource(fileName); FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
if (resource == null) {
return;
}
FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(resource);
Set<String> configKeys = config.getKeys(true); Set<String> configKeys = config.getKeys(true);
Set<String> internalConfigKeys = internalConfig.getKeys(true); Set<String> internalConfigKeys = internalConfig.getKeys(true);