Fix ArmorMechanics not reloading on the first enable

WeaponMechanics · Aug 14, 2022 · 650ca61 · 650ca61
1 parent 625ed56
commit 650ca61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/me/cjcrafter/armormechanics/ArmorMechanics.java b/src/main/java/me/cjcrafter/armormechanics/ArmorMechanics.java
@@ -83,6 +83,9 @@ public void onEnable() {
 
         Command.register();
 
+        reload();
+
+        // Automatically reload ArmorMechanics if WeaponMechanics reloads.
         new Listener() {
             @EventHandler
             public void onQueue(QueueSerializerEvent event) {
@@ -124,6 +127,12 @@ public TaskChain reload() {
                         }
                     }
 
+                    if (armors.isEmpty()) {
+                        debug.error("Couldn't find any armors from '" + armorFile + "'",
+                                "Keys: " + armorConfig.getKeys(false));
+                        return;
+                    }
+
                     File setFile = new File(getDataFolder(), "Set.yml");
                     FileConfiguration setConfig = YamlConfiguration.loadConfiguration(setFile);
 

diff --git a/src/main/java/me/cjcrafter/armormechanics/Command.java b/src/main/java/me/cjcrafter/armormechanics/Command.java
@@ -124,6 +124,12 @@ public static void give(CommandSender sender, List<Entity> entities, String titl
 
         title = StringUtil.didYouMean(title, startsWith.isEmpty() ? options : startsWith);
         ItemStack armor = ArmorMechanics.INSTANCE.armors.get(title);
+
+        if (armor == null) {
+            sender.sendMessage(RED + "Couldn't find armor '" + title + "'... Choose from " + options);
+            return;
+        }
+
         EquipmentSlot slot = ArmorMechanicsAPI.getEquipmentSlot(armor.getType());
 
         boolean force = 1 == (int) data.getOrDefault("forceEquip", 0);