From 93c97cf94b52d4117140fb00ce3b93f59bdd25f2 Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Thu, 28 Mar 2024 03:47:40 +0800 Subject: [PATCH] Patch --- src/main/java/fr/xephi/authme/AuthMe.java | 8 +++++--- .../java/fr/xephi/authme/initialization/TaskCloser.java | 9 +-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 7e3a2603..cdcf9ac6 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -6,6 +6,7 @@ import com.github.Anon8281.universalScheduler.UniversalScheduler; import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler; import fr.xephi.authme.api.v3.AuthMeApi; import fr.xephi.authme.command.CommandHandler; +import fr.xephi.authme.command.TabCompleteHandler; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.initialization.DataFolder; import fr.xephi.authme.initialization.DataSourceProvider; @@ -57,6 +58,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Objects; import java.util.Scanner; import java.util.function.Consumer; import java.util.logging.Level; @@ -208,8 +210,8 @@ public class AuthMe extends JavaPlugin { } //detect server brand with classloader checkServerType(); -// Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler()); -// Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler()); + Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler()); + Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler()); logger.info("AuthMeReReloaded is enabled successfully!"); // Purge on start if enabled PurgeService purgeService = injector.getSingleton(PurgeService.class); @@ -403,7 +405,7 @@ public class AuthMe extends JavaPlugin { } // Wait for tasks and close data source - new TaskCloser(this, database).run(); + new TaskCloser(database).run(); // Disabled correctly Consumer infoLogMethod = logger == null ? getLogger()::info : logger::info; diff --git a/src/main/java/fr/xephi/authme/initialization/TaskCloser.java b/src/main/java/fr/xephi/authme/initialization/TaskCloser.java index 8356b28b..4cd6daa9 100644 --- a/src/main/java/fr/xephi/authme/initialization/TaskCloser.java +++ b/src/main/java/fr/xephi/authme/initialization/TaskCloser.java @@ -4,8 +4,6 @@ import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskSchedule import fr.xephi.authme.AuthMe; import fr.xephi.authme.datasource.DataSource; -import java.util.logging.Logger; - /** * Waits for asynchronous tasks to complete before closing the data source * so the plugin can shut down properly. @@ -13,20 +11,15 @@ import java.util.logging.Logger; public class TaskCloser implements Runnable { private final TaskScheduler scheduler; - private final Logger logger; - private final AuthMe plugin; private final DataSource dataSource; /** * Constructor. * - * @param plugin the plugin instance * @param dataSource the data source (nullable) */ - public TaskCloser(AuthMe plugin, DataSource dataSource) { + public TaskCloser(DataSource dataSource) { this.scheduler = AuthMe.getScheduler(); - this.logger = plugin.getLogger(); - this.plugin = plugin; this.dataSource = dataSource; }