From 203777527695990456ec6973c9ca8d52c81c59f9 Mon Sep 17 00:00:00 2001
From: SupItsDillon <SupItsDillon@users.noreply.github.com>
Date: Tue, 8 Dec 2020 16:08:31 +0000
Subject: [PATCH] Update Discord.java

stuff to disable or enable discord verification
---
 .../totalfreedommod/discord/Discord.java      | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index 7f419f51..ae5453c3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.staff.StaffMember;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -59,9 +59,17 @@ public class Discord extends FreedomService
 
     public static JDA bot = null;
     public Boolean enabled = false;
+    public Boolean enableBot = false;
 
     public void startBot()
+
     {
+        enableBot = (ConfigEntry.DISCORD_VERIFICATION.getBoolean());
+        if (enableBot == false)
+        {
+            FLog.info("Discord Verification has been manually disabled.");
+            return;
+        }
         enabled = !Strings.isNullOrEmpty(ConfigEntry.DISCORD_TOKEN.getString());
         if (!enabled)
         {
@@ -298,7 +306,7 @@ public class Discord extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
     {
-        if (!plugin.al.isVanished(event.getPlayer().getName()))
+        if (!plugin.sl.isVanished(event.getPlayer().getName()))
         {
             messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
         }
@@ -307,7 +315,7 @@ public class Discord extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLeave(PlayerQuitEvent event)
     {
-        if (!plugin.al.isVanished(event.getPlayer().getName()))
+        if (!plugin.sl.isVanished(event.getPlayer().getName()))
         {
             messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
         }
@@ -428,7 +436,7 @@ public class Discord extends FreedomService
         return true;
     }
 
-    public static boolean syncRoles(Admin admin, String discordID)
+    public static boolean syncRoles(StaffMember staffMember, String discordID)
     {
         if (discordID == null)
         {
@@ -462,7 +470,7 @@ public class Discord extends FreedomService
             return false;
         }
 
-        if (!admin.isActive())
+        if (!staffMember.isActive())
         {
             if (member.getRoles().contains(adminRole))
             {
@@ -475,7 +483,7 @@ public class Discord extends FreedomService
             return true;
         }
 
-        if (admin.getRank().equals(Rank.ADMIN))
+        if (staffMember.getRank().equals(Rank.ADMIN))
         {
             if (!member.getRoles().contains(adminRole))
             {
@@ -487,7 +495,7 @@ public class Discord extends FreedomService
             }
             return true;
         }
-        else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
+        else if (staffMember.getRank().equals(Rank.SENIOR_ADMIN))
         {
             if (!member.getRoles().contains(senioradminRole))
             {
@@ -501,4 +509,4 @@ public class Discord extends FreedomService
         }
         return false;
     }
-}
\ No newline at end of file
+}