From 13b727c77909f2ba84452afaa49dbd2bc5835294 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Fri, 9 Jul 2021 11:26:30 +0100 Subject: [PATCH] Fix possible NPE when loading material sets from config --- .../com/Acrobot/ChestShop/Configuration/Properties.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java index a256e35..78e14cc 100644 --- a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java +++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java @@ -43,9 +43,10 @@ public class Properties { if (o instanceof Material) { set.add((Material) o); } else if (o instanceof String) { - try { - set.add(Material.getMaterial(((String) o).toUpperCase(Locale.ROOT))); - } catch (IllegalArgumentException e) { + Material m = Material.getMaterial(((String) o).toUpperCase(Locale.ROOT)); + if (m != null) { + set.add(m); + } else { ChestShop.getBukkitLogger().log(Level.WARNING, o + " is not a valid Material name in the config!"); } }