From 5d2dfd9e19f1fa9909a0eb08144faf72eef4f911 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Wed, 6 Sep 2023 00:05:47 +0200 Subject: [PATCH] Fixed potentially failing to load worth file if a material is invalid --- .../java/com/alttd/config/WorthConfig.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alttd/config/WorthConfig.java b/src/main/java/com/alttd/config/WorthConfig.java index bc69ee0..e2f7dcf 100644 --- a/src/main/java/com/alttd/config/WorthConfig.java +++ b/src/main/java/com/alttd/config/WorthConfig.java @@ -52,7 +52,14 @@ public class WorthConfig extends AbstractConfig { Logger.severe("Null key in worth.yml?"); continue; } - Material material = Material.getMaterial(key); + + Material material; + try { + material = Material.getMaterial(key); + } catch (Exception e) { + Logger.warning("Invalid material % in trade worth", key); + continue; + } map.put(material, new PriceRange(Utilities.round(worth.getDouble(key + ".lower"), 2), Utilities.round(worth.getDouble(key + ".upper"), 2)).getRandomPrice()); } @@ -72,7 +79,14 @@ public class WorthConfig extends AbstractConfig { Logger.severe("Null key in worth.yml?"); continue; } - Material material = Material.getMaterial(key); + + Material material; + try { + material = Material.getMaterial(key); + } catch (Exception e) { + Logger.warning("Invalid material % in trade worth", key); + continue; + } map.put(material, new Price(Utilities.round(worth.getDouble(key), 2), material)); } }