Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

option to show vanished players on the player count

This commit is contained in:
Joe Shimell 2020-07-11 19:38:34 +01:00
parent e71d68f910
commit 38af892584
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/uk/co/angrybee/joe/Configs/MainConfig.java
View File

@ -115,6 +115,8 @@ public class MainConfig
CheckEntry("show-player-count", true);
CheckEntry("show-vanished-players-in-player-count", false);
// Remove old role entry if found, move role to new array (for people with v1.3.6 or below)
if(whitelisterBotConfig.get("whitelisted-role") != null)
{

9
src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java
View File

@ -35,7 +35,6 @@ public class DiscordWhitelister extends JavaPlugin
private static boolean configCreated = false;
private static boolean userListCreated = false;
private static boolean removedListCreated = false;
private static boolean customMessagesCreated = false;
public static boolean useEasyWhitelist = false;
public static boolean useCustomMessages = false;
@ -43,6 +42,7 @@ public class DiscordWhitelister extends JavaPlugin
public static boolean useCustomPrefixes = false;
public static boolean showPlayerSkin = true;
public static boolean addInGameRemovesToList = true;
public static boolean showVanishedPlayersInCount = false;
public static boolean botEnabled;
@ -154,6 +154,8 @@ public class DiscordWhitelister extends JavaPlugin
botEnabled = getWhitelisterBotConfig().getBoolean("bot-enabled");
showPlayerSkin = getWhitelisterBotConfig().getBoolean("show-player-skin-on-whitelist");
configCreated = MainConfig.configCreated;
showVanishedPlayersInCount = MainConfig.getMainConfig().getBoolean("show-vanished-players-in-player-count");
DiscordClient.whitelistAddPrefix = CustomPrefixConfig.getCustomPrefixesConfig().getString("whitelist-add-prefix");
DiscordClient.whitelistRemovePrefix = CustomPrefixConfig.getCustomPrefixesConfig().getString("whitelist-remove-prefix");
@ -241,7 +243,7 @@ public class DiscordWhitelister extends JavaPlugin
File dataFolder = thisPlugin.getDataFolder();
Logger pluginLogger = thisPlugin.getLogger();
// Run this first as it creates the root folder if it does not exist
// Run this first, as it creates the root folder if it does not exist
MainConfig.ConfigSetup();
CustomPrefixConfig.ConfigSetup();
CustomMessagesConfig.ConfigSetup();
@ -249,9 +251,6 @@ public class DiscordWhitelister extends JavaPlugin
userListFile = new File(dataFolder, "user-list.yml");
removedListFile = new File(dataFolder, "removed-list.yml");
if(!userListFile.exists())
{
try

32
src/main/java/uk/co/angrybee/joe/Events/JoinLeaveEvents.java
View File

@ -14,12 +14,16 @@ public class JoinLeaveEvents implements Listener
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event)
{
if(event.getPlayer().hasPermission("discordsrv.silentjoin") ||
event.getPlayer().hasPermission("discordsrv.silentquit") ||
event.getPlayer().hasPermission("sv.joinvanished")) {
DiscordWhitelister.getPlugin().getLogger().info("Player " + event.getPlayer().getDisplayName() + " joined with silent joining/quitting permission, not incrementing player count");
DiscordWhitelister.addVanishedPlayer();
return;
if(!DiscordWhitelister.showVanishedPlayersInCount)
{
if(event.getPlayer().hasPermission("discordsrv.silentjoin")
|| event.getPlayer().hasPermission("discordsrv.silentquit")
|| event.getPlayer().hasPermission("sv.joinvanished"))
{
DiscordWhitelister.getPlugin().getLogger().info("Player " + event.getPlayer().getDisplayName() + " joined with silent joining/quitting permission, not incrementing player count");
DiscordWhitelister.addVanishedPlayer();
return;
}
}
DiscordClient.SetPlayerCountStatus(DiscordWhitelister.getOnlineUsers());
}
@ -27,12 +31,16 @@ public class JoinLeaveEvents implements Listener
@EventHandler
public void onPlayerLeave(PlayerQuitEvent event)
{
if(event.getPlayer().hasPermission("discordsrv.silentjoin") ||
event.getPlayer().hasPermission("discordsrv.silentquit") ||
event.getPlayer().hasPermission("sv.joinvanished")) {
DiscordWhitelister.getPlugin().getLogger().info("Player " + event.getPlayer().getDisplayName() + " quit with silent joining/quitting permission, not decrementing player count");
DiscordWhitelister.removeVanishedPlayer();
return;
if(!DiscordWhitelister.showVanishedPlayersInCount)
{
if(event.getPlayer().hasPermission("discordsrv.silentjoin")
|| event.getPlayer().hasPermission("discordsrv.silentquit")
|| event.getPlayer().hasPermission("sv.joinvanished"))
{
DiscordWhitelister.getPlugin().getLogger().info("Player " + event.getPlayer().getDisplayName() + " quit with silent joining/quitting permission, not decrementing player count");
DiscordWhitelister.removeVanishedPlayer();
return;
}
}
DiscordClient.SetPlayerCountStatus(DiscordWhitelister.getOnlineUsers() - 1);
}