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

Fixed potential NPE.

This commit is contained in:
Jeremy Wood 2019-01-28 19:43:13 -05:00
parent ae314108a3
commit a7cace0fdc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -643,11 +643,15 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
if (feeSection.isInt("currency")) {
int oldCurrencyItemId = feeSection.getInt("currency", -1);
if (oldCurrencyItemId >= 0) {
String flatteningType = IdMappings.getById(Integer.toString(oldCurrencyItemId))
.getFlatteningType();
world.setCurrency(Material.matchMaterial(flatteningType));
IdMappings.Mapping mapping = IdMappings.getById(Integer.toString(oldCurrencyItemId));
if (mapping != null) {
world.setCurrency(Material.matchMaterial(mapping.getFlatteningType()));
} else {
world.setCurrency(null);
}
} else {
world.setCurrency(null);
}
world.setCurrency(null);
}
if (feeSection.isDouble("amount"))