Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE when section doesn't exist (Fixes #99)

This commit is contained in:
Phoenix616 2018-01-13 23:33:22 +01:00
parent 6d4db1c8f6
commit 1788fa9702
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/Acrobot/ChestShop/Listeners/Modules/PriceRestrictionModule.java
View File

@ -6,6 +6,7 @@ import com.Acrobot.Breeze.Utils.PriceUtil;
import com.Acrobot.ChestShop.ChestShop;
import com.Acrobot.ChestShop.Events.PreShopCreationEvent;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -73,12 +74,15 @@ public class PriceRestrictionModule implements Listener {
}
private void convertToMaterial(String sectionPath) {
for (String typeId : configuration.getConfigurationSection(sectionPath).getKeys(false)) {
if (NumberUtil.isInteger(typeId)) {
Material material = Material.matchMaterial(typeId);
if (material != null) {
configuration.set(sectionPath + "." + material.toString().toLowerCase(), configuration.get(sectionPath + "." + typeId));
configuration.set(sectionPath + "." + typeId, null);
ConfigurationSection section = configuration.getConfigurationSection(sectionPath);
if (section != null) {
for (String typeId : section.getKeys(false)) {
if (NumberUtil.isInteger(typeId)) {
Material material = Material.matchMaterial(typeId);
if (material != null) {
configuration.set(sectionPath + "." + material.toString().toLowerCase(), configuration.get(sectionPath + "." + typeId));
configuration.set(sectionPath + "." + typeId, null);
}
}
}
}