From b2af579896681620e90ae1f9168846852c8113a0 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Tue, 9 Jun 2020 12:25:55 +0200
Subject: [PATCH] Add invalid description error message

---
 .../net/frankheijden/serverutils/config/Messenger.java     | 1 +
 .../frankheijden/serverutils/managers/PluginManager.java   | 7 ++++---
 .../java/net/frankheijden/serverutils/managers/Result.java | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/frankheijden/serverutils/config/Messenger.java b/src/main/java/net/frankheijden/serverutils/config/Messenger.java
index 1c46fb2..564b3fd 100644
--- a/src/main/java/net/frankheijden/serverutils/config/Messenger.java
+++ b/src/main/java/net/frankheijden/serverutils/config/Messenger.java
@@ -18,6 +18,7 @@ public class Messenger {
                     "not_enabled", "&cAn error occurred while %action%ing &4%what%&c, plugin is not enabled!",
                     "already_enabled", "&cAn error occurred while %action%ing &4%what%&c, plugin is already enabled!",
                     "file_changed", "&cAccessing the jar file while %action%ing &4%what%&c went wrong, please load the plugin manually!",
+                    "invalid_description", "&cAn error occurred while %action%ing &4%what%&c, plugin doesn't have a valid description!",
                     "update", Defaults.of(
                             "available", "&8&m------------=&r&8[ &b&lServerUtils Update&r &8]&m=--------------\n"
                                     + " &3Current version: &b%old%\n"
diff --git a/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java b/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java
index 69a9a7b..cf3974a 100644
--- a/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java
+++ b/src/main/java/net/frankheijden/serverutils/managers/PluginManager.java
@@ -4,8 +4,7 @@ import net.frankheijden.serverutils.ServerUtils;
 import net.frankheijden.serverutils.reflection.*;
 import org.bukkit.Bukkit;
 import org.bukkit.command.*;
-import org.bukkit.plugin.InvalidPluginException;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.*;
 import org.bukkit.plugin.java.PluginClassLoader;
 
 import java.io.File;
@@ -24,6 +23,8 @@ public class PluginManager {
         if (!file.exists()) return new LoadResult(Result.NOT_EXISTS);
         try {
             return new LoadResult(Bukkit.getPluginManager().loadPlugin(file), Result.SUCCESS);
+        } catch (InvalidDescriptionException ex) {
+            return new LoadResult(Result.INVALID_DESCRIPTION);
         } catch (InvalidPluginException ex) {
             if (ex.getCause() instanceof IllegalArgumentException) {
                 IllegalArgumentException e = (IllegalArgumentException) ex.getCause();
@@ -31,9 +32,9 @@ public class PluginManager {
                     return new LoadResult(Result.ALREADY_ENABLED);
                 }
             }
-        } catch (Exception ex) {
             ex.printStackTrace();
         }
+
         return new LoadResult(Result.ERROR);
     }
 
diff --git a/src/main/java/net/frankheijden/serverutils/managers/Result.java b/src/main/java/net/frankheijden/serverutils/managers/Result.java
index 766258b..27befba 100644
--- a/src/main/java/net/frankheijden/serverutils/managers/Result.java
+++ b/src/main/java/net/frankheijden/serverutils/managers/Result.java
@@ -8,6 +8,7 @@ public enum Result {
     NOT_ENABLED,
     ALREADY_ENABLED,
     FILE_CHANGED,
+    INVALID_DESCRIPTION,
     ERROR,
     SUCCESS;