From 1438ca206b42d3d4c1f46eb7024b3a0a4e8cc471 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sat, 31 Jul 2021 21:14:45 -0400 Subject: [PATCH] Added error handling for JsonFormat reading. --- .../mineverse/Aust1n46/chat/json/JsonFormat.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/json/JsonFormat.java b/src/main/java/mineverse/Aust1n46/chat/json/JsonFormat.java index e355d65..1ab0032 100644 --- a/src/main/java/mineverse/Aust1n46/chat/json/JsonFormat.java +++ b/src/main/java/mineverse/Aust1n46/chat/json/JsonFormat.java @@ -30,11 +30,13 @@ public class JsonFormat { int priority = jsonFormatSection.getInt(jsonFormat + ".priority", 0); List jsonAttributes = new ArrayList<>(); ConfigurationSection jsonAttributeSection = jsonFormatSection.getConfigurationSection(jsonFormat + ".json_attributes"); - for (String attribute : jsonAttributeSection.getKeys(false)) { - List hoverText = jsonAttributeSection.getStringList(attribute + ".hover_text"); - String clickAction = jsonAttributeSection.getString(attribute + ".click_action"); - String clickText = jsonAttributeSection.getString(attribute + ".click_text"); - jsonAttributes.add(new JsonAttribute(attribute, hoverText, clickAction, clickText)); + if (jsonAttributeSection != null) { + for (String attribute : jsonAttributeSection.getKeys(false)) { + List hoverText = jsonAttributeSection.getStringList(attribute + ".hover_text"); + String clickAction = jsonAttributeSection.getString(attribute + ".click_action", ""); + String clickText = jsonAttributeSection.getString(attribute + ".click_text", ""); + jsonAttributes.add(new JsonAttribute(attribute, hoverText, clickAction, clickText)); + } } jsonFormats.put(jsonFormat.toLowerCase(), new JsonFormat(jsonFormat, priority, jsonAttributes)); }