From 3057421d6d36372f1772306a2586cde003520155 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 12 Sep 2020 14:42:12 -0500
Subject: [PATCH] Fixed the last bug for now

---
 .../totalfreedommod/command/Command_slconfig.java        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java
index 81478855..7243ea3e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_slconfig.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.staff.StaffMember;
@@ -285,21 +286,17 @@ public class Command_slconfig extends FreedomCommand
                 FUtil.staffAction(sender.getName(), "Removing " + staffMember.getName() + " from the staff list", true);
                 staffMember.setActive(false);
 
-                if (plugin.pl.getPlayer(player).inStaffChat())
-                {
-                    plugin.pl.getPlayer(player).setStaffChat(false);
-                }
-
                 plugin.sl.save(staffMember);
                 plugin.sl.updateTables();
                 if (player != null)
                 {
                     plugin.rm.updateDisplay(player);
+                    plugin.pl.getPlayer(player).setStaffChat(false);
                 }
 
                 if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
                 {
-                    plugin.dc.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID());
+                    Discord.syncRoles(staffMember, plugin.pl.getData(staffMember.getName()).getDiscordID());
                 }
 
                 plugin.amp.updateAccountStatus(staffMember);