From b43a9b674997bc78d238bf2c62456fd38e2095e8 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Fri, 29 Jun 2018 12:36:42 -0700
Subject: [PATCH] Unlinkdiscord now works for ops

---
 .../command/Command_unlinkdiscord.java        | 31 ++++++++++++++-----
 .../command/Command_vanish.java               |  2 +-
 .../totalfreedommod/config/MainConfig.java    |  1 -
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
index 074faef5..75a9ba7d 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import org.bukkit.command.Command;
@@ -20,15 +21,31 @@ public class Command_unlinkdiscord extends FreedomCommand
             msg("The discord verification system is currently disabled.", ChatColor.RED);
             return true;
         }
-        
-        Admin admin = plugin.al.getAdmin(playerSender);
-        if (admin.getDiscordID() == null)
+
+        if (plugin.al.isAdmin(playerSender))
         {
-            msg("Your minecraft account is not linked to a discord account.", ChatColor.RED);
+            Admin admin = plugin.al.getAdmin(playerSender);
+            if (admin.getDiscordID() == null)
+            {
+                msg("Your minecraft account is not linked to a discord account.", ChatColor.RED);
+                return true;
+            }
+            admin.setDiscordID(null);
+            msg("Your minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
+            return true;
+        }
+        else
+        {
+            VPlayer data = plugin.pv.getVerificationPlayer(playerSender);
+            if (data.getDiscordId() == null)
+            {
+                msg("Your minecraft account is not linked to a discord account.", ChatColor.RED);
+                return true;
+            }
+            data.setDiscordId(null);
+            data.setDiscordEnabled(false);
+            msg("Your minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
             return true;
         }
-        admin.setDiscordID(null);
-        msg("Your minecraft account has been successfully unlinked from the discord account.", ChatColor.GREEN);
-        return true;
     }
 }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
index da74105a..b4ce92d0 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
@@ -18,7 +18,7 @@ import me.totalfreedom.totalfreedommod.rank.Rank;
 @CommandParameters(description = "Vanish/unvanish yourself.", usage = "/<command> [-s[ilent]]", aliases = "v")
 public class Command_vanish extends FreedomCommand
 {
-    public static ArrayList<Player> VANISHED = new ArrayList<Player>();
+    public static ArrayList<Player> VANISHED = new ArrayList<>();
 
     public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) {
         Displayable display = plugin.rm.getDisplay(playerSender);
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java b/src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java
index 592f5cf1..8da95ec1 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/config/MainConfig.java
@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.config;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;