AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Discord.java

Browse Source 
correct updated file
This commit is contained in:
SupItsDillon 2020-12-09 15:37:31 +00:00 committed by GitHub
parent 6441deceab
commit 777a66f8da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
View File

@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.staff.StaffMember; import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
@ -59,12 +59,11 @@ public class Discord extends FreedomService
public static JDA bot = null; public static JDA bot = null;
public Boolean enabled = false; public Boolean enabled = false;
public Boolean enableBot = false; public Boolean enableBot = false;
public void startBot() public void startBot()
{ {
enableBot = (ConfigEntry.DISCORD_VERIFICATION.getBoolean()); enableBot = (ConfigEntry.DISCORD_VERIFICATION.getBoolean());
if (!enableBot) if (!enableBot)
{ {
FLog.info("Discord Verification has been manually disabled."); FLog.info("Discord Verification has been manually disabled.");
@ -306,7 +305,7 @@ public class Discord extends FreedomService
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(PlayerJoinEvent event)
{ {
if (!plugin.sl.isVanished(event.getPlayer().getName())) if (!plugin.al.isVanished(event.getPlayer().getName()))
{ {
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**"); messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
} }
@ -315,7 +314,7 @@ public class Discord extends FreedomService
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerLeave(PlayerQuitEvent event) public void onPlayerLeave(PlayerQuitEvent event)
{ {
if (!plugin.sl.isVanished(event.getPlayer().getName())) if (!plugin.al.isVanished(event.getPlayer().getName()))
{ {
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**"); messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
} }
@ -436,7 +435,7 @@ public class Discord extends FreedomService
return true; return true;
} }
public static boolean syncRoles(StaffMember staffMember, String discordID) public static boolean syncRoles(Admin admin, String discordID)
{ {
if (discordID == null) if (discordID == null)
{ {
@ -470,7 +469,7 @@ public class Discord extends FreedomService
return false; return false;
} }
if (!staffMember.isActive()) if (!admin.isActive())
{ {
if (member.getRoles().contains(adminRole)) if (member.getRoles().contains(adminRole))
{ {
@ -483,7 +482,7 @@ public class Discord extends FreedomService
return true; return true;
} }
if (staffMember.getRank().equals(Rank.ADMIN)) if (admin.getRank().equals(Rank.ADMIN))
{ {
if (!member.getRoles().contains(adminRole)) if (!member.getRoles().contains(adminRole))
{ {
@ -495,7 +494,7 @@ public class Discord extends FreedomService
} }
return true; return true;
} }
else if (staffMember.getRank().equals(Rank.SENIOR_ADMIN)) else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
{ {
if (!member.getRoles().contains(senioradminRole)) if (!member.getRoles().contains(senioradminRole))
{ {