From 5c850e46c45ab7445f4f60d7186f187b9601b2f8 Mon Sep 17 00:00:00 2001 From: games647 Date: Wed, 11 May 2016 17:16:29 +0200 Subject: [PATCH] Clean up a bit --- src/main/java/fr/xephi/authme/AuthMe.java | 3 ++- .../authme/PurgeBannedPlayersCommand.java | 2 +- .../executable/authme/PurgeCommand.java | 2 +- .../java/fr/xephi/authme/task/PurgeTask.java | 21 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index d636426c..496ad53e 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -706,7 +706,8 @@ public class AuthMe extends JavaPlugin { ConsoleLogger.info("AutoPurging the Database: " + cleared.size() + " accounts removed!"); ConsoleLogger.info("Purging user accounts..."); - new PurgeTask(plugin, newSettings, Bukkit.getConsoleSender(), cleared).runTaskTimer(plugin, 0, 1); + new PurgeTask(plugin, Bukkit.getConsoleSender(), cleared, true, Bukkit.getOfflinePlayers()) + .runTaskTimer(plugin, 0, 1); } // Return the spawn location of a player diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java index 1f0a7c9c..92a4b50c 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java @@ -47,6 +47,6 @@ public class PurgeBannedPlayersCommand implements ExecutableCommand { // Show a status message sender.sendMessage(ChatColor.GOLD + "Purging user accounts..."); - new PurgeTask(plugin, plugin.getSettings(), sender, namedBanned, bannedPlayers).runTaskTimer(plugin, 0, 1); + new PurgeTask(plugin, sender, namedBanned, bannedPlayers).runTaskTimer(plugin, 0, 1); } } diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java index dd36e5bc..a0811cfe 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java @@ -68,6 +68,6 @@ public class PurgeCommand implements ExecutableCommand { // Show a status message sender.sendMessage(ChatColor.GOLD + "Deleted " + purged.size() + " user accounts"); sender.sendMessage(ChatColor.GOLD + "Purging user accounts..."); - new PurgeTask(plugin, plugin.getSettings(), sender, purged).runTaskTimer(plugin, 0, 1); + new PurgeTask(plugin, sender, purged).runTaskTimer(plugin, 0, 1); } } diff --git a/src/main/java/fr/xephi/authme/task/PurgeTask.java b/src/main/java/fr/xephi/authme/task/PurgeTask.java index f8835a26..97ffcc88 100644 --- a/src/main/java/fr/xephi/authme/task/PurgeTask.java +++ b/src/main/java/fr/xephi/authme/task/PurgeTask.java @@ -34,20 +34,19 @@ public class PurgeTask extends BukkitRunnable { private int currentPage = 0; - public PurgeTask(AuthMe plugin, NewSetting newSetting, CommandSender sender - , Set purged, Set offlinePlayers) { - this(plugin, newSetting, sender, purged, false + public PurgeTask(AuthMe plugin, CommandSender sender, Set purged) { + this(plugin, sender, purged, false, Bukkit.getOfflinePlayers()); + } + + public PurgeTask(AuthMe plugin, CommandSender sender, Set purged, Set offlinePlayers) { + this(plugin, sender, purged, false , offlinePlayers.toArray(new OfflinePlayer[offlinePlayers.size()])); } - public PurgeTask(AuthMe plugin, NewSetting newSetting, CommandSender sender, Set purged) { - this(plugin, newSetting, sender, purged, false, Bukkit.getOfflinePlayers()); - } - - public PurgeTask(AuthMe plugin, NewSetting newSetting, CommandSender sender, Set purged - , boolean autoPurging, OfflinePlayer[] offlinePlayers) { + public PurgeTask(AuthMe plugin, CommandSender sender, Set purged + , boolean autoPurge, OfflinePlayer[] offlinePlayers) { this.plugin = plugin; - this.newSetting = newSetting; + this.newSetting = plugin.getSettings(); if (sender instanceof Player) { this.sender = ((Player) sender).getUniqueId(); @@ -57,7 +56,7 @@ public class PurgeTask extends BukkitRunnable { this.toPurge = purged; this.totalPurgeCount = purged.size(); - this.autoPurging = autoPurging; + this.autoPurging = autoPurge; this.offlinePlayers = offlinePlayers; //this is commented out because I assume all players in the database already have an lowercase name