From bb639328a319b1b2bca27877a6ba56dde5dd616f Mon Sep 17 00:00:00 2001
From: darbyjack <admin@glaremasters.me>
Date: Wed, 25 Mar 2020 23:27:56 -0500
Subject: [PATCH] Push to 2.10.5 for release pt2

---
 .../java/me/clip/placeholderapi/PlaceholderAPIPlugin.java | 5 ++---
 .../placeholderapi/commands/PlaceholderAPICommands.java   | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index 9830b21..076d35a 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -72,7 +72,7 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
       Class.forName("org.spigotmc.SpigotConfig");
       Class.forName("net.md_5.bungee.api.chat.BaseComponent");
       spigot = true;
-    } catch (ExceptionInInitializerError | ClassNotFoundException exception) {
+    } catch (ExceptionInInitializerError | ClassNotFoundException ignored) {
     }
 
     return new Version(v, spigot);
@@ -270,11 +270,10 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
   public void enableCloud() {
     if (expansionCloud == null) {
       expansionCloud = new ExpansionCloudManager(this);
-      expansionCloud.fetch(config.cloudAllowUnverifiedExpansions());
     } else {
       expansionCloud.clean();
-      expansionCloud.fetch(config.cloudAllowUnverifiedExpansions());
     }
+    expansionCloud.fetch(config.cloudAllowUnverifiedExpansions());
   }
 
   public void disableCloud() {
diff --git a/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java
index be3639e..2d5a5f8 100644
--- a/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java
+++ b/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java
@@ -79,15 +79,13 @@ public class PlaceholderAPICommands implements CommandExecutor {
             "&fReload the config settings");
 
         if (s.hasPermission("placeholderapi.ecloud")) {
-          if (plugin.getExpansionCloud() == null) {
-            Msg.msg(s, "&b/papi enablecloud",
-                "&fEnable the expansion cloud");
-          } else {
             Msg.msg(s, "&b/papi disablecloud",
                 "&fDisable the expansion cloud",
                 "&b/papi ecloud",
                 "&fView ecloud command usage");
-          }
+
+          Msg.msg(s, "&b/papi enablecloud",
+                  "&fEnable the expansion cloud");
         }
 
         return true;