From a7cace0fdcee1b21ecb846e9551f6ad75924c0e0 Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Mon, 28 Jan 2019 19:43:13 -0500 Subject: [PATCH] Fixed potential NPE. --- .../onarandombox/MultiverseCore/MultiverseCore.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 85a254bd..cef29997 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -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"))