skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in upgrade map parsing.

Browse Source
This commit is contained in:
garbagemule
2014-02-06 01:07:29 +01:00
parent 7b51fb678c
commit 96870e826b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/garbagemule/MobArena/waves/WaveParser.java
+10 -5
View File
@@ -375,7 +375,12 @@ public class WaveParser
} }
private static Map<String,List<Upgrade>> getUpgradeMap(ConfigurationSection config) { private static Map<String,List<Upgrade>> getUpgradeMap(ConfigurationSection config) {
Set<String> classes = config.getConfigurationSection("upgrades").getKeys(false); ConfigurationSection section = config.getConfigurationSection("upgrades");
if (section == null) {
return null;
}
Set<String> classes = section.getKeys(false);
if (classes == null || classes.isEmpty()) { if (classes == null || classes.isEmpty()) {
return null; return null;
} }
@@ -398,11 +403,11 @@ public class WaveParser
} }
// New complex setup // New complex setup
else if (val instanceof ConfigurationSection) { else if (val instanceof ConfigurationSection) {
ConfigurationSection section = (ConfigurationSection) val; ConfigurationSection classSection = (ConfigurationSection) val;
List<Upgrade> list = new ArrayList<Upgrade>(); List<Upgrade> list = new ArrayList<Upgrade>();
// Items (Generic + Weapons) // Items (Generic + Weapons)
itemList = section.getString("items", null); itemList = classSection.getString("items", null);
if (itemList != null) { if (itemList != null) {
for (ItemStack stack : ItemParser.parseItems(itemList)) { for (ItemStack stack : ItemParser.parseItems(itemList)) {
list.add(ArenaClass.isWeapon(stack) ? new WeaponUpgrade(stack) : new GenericUpgrade(stack)); list.add(ArenaClass.isWeapon(stack) ? new WeaponUpgrade(stack) : new GenericUpgrade(stack));
@@ -410,7 +415,7 @@ public class WaveParser
} }
// Armor // Armor
itemList = section.getString("armor", null); itemList = classSection.getString("armor", null);
if (itemList != null) { if (itemList != null) {
for (ItemStack stack : ItemParser.parseItems(itemList)) { for (ItemStack stack : ItemParser.parseItems(itemList)) {
list.add(new ArmorUpgrade(stack)); list.add(new ArmorUpgrade(stack));
@@ -418,7 +423,7 @@ public class WaveParser
} }
// Permissions // Permissions
List<String> perms = section.getStringList("permissions"); List<String> perms = classSection.getStringList("permissions");
if (!perms.isEmpty()) { if (!perms.isEmpty()) {
for (String perm : perms) { for (String perm : perms) {
list.add(new PermissionUpgrade(perm)); list.add(new PermissionUpgrade(perm));