From 2008871658e1bd127dbdd8adbbdb8bd7cc3274d0 Mon Sep 17 00:00:00 2001
From: JeromSar <jerom.sar@hotmail.com>
Date: Fri, 26 Aug 2016 22:06:20 +0200
Subject: [PATCH] Fixed /dtoggle Apparantly LibsDisguises does not support
 plugin reloading. Now switched back to OxLemonxO's method, using a modified
 LibsDisguises method

---
 .../bridge/LibsDisguisesBridge.java           | 21 ++++++++++++-------
 .../command/Command_disguisetoggle.java       | 16 ++++++++------
 .../totalfreedommod/command/SourceType.java   |  3 +--
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
index 4c05e3e4..ed7bc978 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
+import me.libraryaddict.disguise.DisallowedDisguises;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.totalfreedom.totalfreedommod.FreedomService;
@@ -49,6 +50,7 @@ public class LibsDisguisesBridge extends FreedomService
                 FLog.severe(ex);
             }
         }
+
         return libsDisguisesPlugin;
     }
 
@@ -98,25 +100,28 @@ public class LibsDisguisesBridge extends FreedomService
         }
     }
 
-    public boolean setPluginEnabled(boolean enabled)
+    public void setDisguisesEnabled(boolean state)
     {
-        Plugin ld = getLibsDisguisesPlugin();
+        final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
 
-        if (ld == null)
+        if (libsDisguises == null)
         {
-            return false;
+            return;
         }
 
-        if (enabled)
+        if (state)
         {
-            server.getPluginManager().enablePlugin(ld);
+            DisguiseAPI.enableDisguises();
         }
         else
         {
-            server.getPluginManager().disablePlugin(ld);
+            DisguiseAPI.disableDisguises();
         }
+    }
 
-        return true;
+    public boolean isDisguisesEnabled()
+    {
+        return !DisallowedDisguises.disabled;
     }
 
     public boolean isPluginEnabled()
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
index 5fec36f8..4eec65f2 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.libraryaddict.disguise.DisallowedDisguises;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.Command;
@@ -15,22 +16,25 @@ public class Command_disguisetoggle extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (plugin.ldb.getLibsDisguisesPlugin() == null)
+        if (!plugin.ldb.isPluginEnabled())
         {
             msg(ChatColor.RED + "LibsDisguises is not enabled.");
             return true;
         }
 
-        boolean newState = !plugin.ldb.isPluginEnabled();
-        FUtil.adminAction(sender.getName(), (newState ? "Enabling" : "Disabling") + " disguises", false);
+        FUtil.adminAction(sender.getName(), (DisallowedDisguises.disabled ? "Enabling" : "Disabling") + " Disguises", false);
 
-        if (!newState)
+        if (plugin.ldb.isDisguisesEnabled())
         {
             plugin.ldb.undisguiseAll(true);
+            plugin.ldb.setDisguisesEnabled(false);
+        }
+        else
+        {
+            plugin.ldb.setDisguisesEnabled(true);
         }
-        plugin.ldb.setPluginEnabled(newState);
 
-        msg("Disguises are now " + (newState ? "enabled." : "disabled."));
+        msg("Enabled " + (DisallowedDisguises.disabled ? "enabled." : "disabled."));
 
         return true;
     }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/SourceType.java b/src/main/java/me/totalfreedom/totalfreedommod/command/SourceType.java
index 0cd232f0..207a0fe0 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/SourceType.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/SourceType.java
@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
-public enum SourceType
-{
+public enum SourceType {
 
     ONLY_IN_GAME, ONLY_CONSOLE, BOTH;
 }