From b6476dcb79d43b478a737b79713ea3233aa1b8ce Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 31 May 2024 20:17:02 +0800 Subject: [PATCH] Revert --- .../fr/xephi/authme/service/CommonService.java | 15 --------------- .../java/fr/xephi/authme/util/PlayerUtils.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/fr/xephi/authme/service/CommonService.java b/src/main/java/fr/xephi/authme/service/CommonService.java index 4c5a211c..92a49267 100644 --- a/src/main/java/fr/xephi/authme/service/CommonService.java +++ b/src/main/java/fr/xephi/authme/service/CommonService.java @@ -6,8 +6,6 @@ import fr.xephi.authme.message.Messages; import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; -import fr.xephi.authme.settings.properties.PluginSettings; -import fr.xephi.authme.util.Utils; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -24,9 +22,6 @@ public class CommonService { @Inject private Messages messages; - @Inject - private BukkitService bukkitService; - @Inject private PermissionsManager permissionsManager; @@ -51,11 +46,6 @@ public class CommonService { * @param key the message key */ public void send(CommandSender sender, MessageKey key) { - if (Utils.majorVersion < 12 && settings.getProperty(PluginSettings.I18N_MESSAGES)) { - bukkitService.runTaskLater(() -> messages.send(sender, key), 35L); - return; - } - messages.send(sender, key); } @@ -67,11 +57,6 @@ public class CommonService { * @param replacements the replacements to apply to the message */ public void send(CommandSender sender, MessageKey key, String... replacements) { - if (Utils.majorVersion < 12 && settings.getProperty(PluginSettings.I18N_MESSAGES)) { - bukkitService.runTaskLater(() -> messages.send(sender, key, replacements), 35L); - return; - } - messages.send(sender, key, replacements); } diff --git a/src/main/java/fr/xephi/authme/util/PlayerUtils.java b/src/main/java/fr/xephi/authme/util/PlayerUtils.java index 2e578905..d9b867d7 100644 --- a/src/main/java/fr/xephi/authme/util/PlayerUtils.java +++ b/src/main/java/fr/xephi/authme/util/PlayerUtils.java @@ -10,7 +10,6 @@ public final class PlayerUtils { // Utility class private PlayerUtils() { } - private static final boolean IS_LEAVES_SERVER = Utils.isClassLoaded("top.leavesmc.leaves.LeavesConfig"); /** @@ -36,4 +35,5 @@ public final class PlayerUtils { return player.hasMetadata("NPC"); } } + }