From 66a51a8e133d920e402ef9e27628625734e38527 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:31:39 +0200 Subject: [PATCH 1/7] Remove unused 'serverId' from BukkitLoginSession --- .../games647/fastlogin/bukkit/BukkitLoginSession.java | 10 ++++------ .../bukkit/listener/protocollib/NameCheckTask.java | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java index 95c317a3..68008246 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java @@ -40,34 +40,32 @@ public class BukkitLoginSession extends LoginSession { private static final byte[] EMPTY_ARRAY = {}; - private final String serverId; private final byte[] verifyToken; private boolean verified; private SkinProperty skinProperty; - public BukkitLoginSession(String username, String serverId, byte[] verifyToken, boolean registered + public BukkitLoginSession(String username, byte[] verifyToken, boolean registered , StoredProfile profile) { super(username, registered, profile); - this.serverId = serverId; this.verifyToken = verifyToken.clone(); } //available for BungeeCord public BukkitLoginSession(String username, boolean registered) { - this(username, "", EMPTY_ARRAY, registered, null); + this(username, EMPTY_ARRAY, registered, null); } //cracked player public BukkitLoginSession(String username, StoredProfile profile) { - this(username, "", EMPTY_ARRAY, false, profile); + this(username, EMPTY_ARRAY, false, profile); } //ProtocolSupport public BukkitLoginSession(String username, boolean registered, StoredProfile profile) { - this(username, "", EMPTY_ARRAY, registered, profile); + this(username, EMPTY_ARRAY, registered, profile); } /** diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java index ee6ba69b..ddfb29d3 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java @@ -104,10 +104,9 @@ public class NameCheckTask extends JoinManagement Date: Sun, 13 Jun 2021 16:33:47 +0200 Subject: [PATCH 2/7] Don't store 'plugin' in BukkitScheduler --- .../com/github/games647/fastlogin/bukkit/BukkitScheduler.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitScheduler.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitScheduler.java index 6367a193..6fab667a 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitScheduler.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitScheduler.java @@ -36,12 +36,10 @@ import org.slf4j.Logger; public class BukkitScheduler extends AsyncScheduler { - private final Plugin plugin; private final Executor syncExecutor; public BukkitScheduler(Plugin plugin, Logger logger, ThreadFactory threadFactory) { super(logger, threadFactory); - this.plugin = plugin; syncExecutor = r -> Bukkit.getScheduler().runTask(plugin, r); } From d51335c6dee75d952e7a73d7d920469d9336ca32 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:36:04 +0200 Subject: [PATCH 3/7] Don't store 'ultraAuthPlugin' --- .../github/games647/fastlogin/bukkit/hook/UltraAuthHook.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java index 046f6229..e8b06e2f 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java @@ -33,9 +33,7 @@ import java.util.concurrent.Future; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; import ultraauth.api.UltraAuthAPI; -import ultraauth.main.Main; import ultraauth.managers.PlayerManager; /** @@ -47,7 +45,6 @@ import ultraauth.managers.PlayerManager; */ public class UltraAuthHook implements AuthPlugin { - private final Plugin ultraAuthPlugin = Main.main; private final FastLoginBukkit plugin; public UltraAuthHook(FastLoginBukkit plugin) { From 9acab1e453b7c133dd27e0778ab8b6676183b4cc Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:43:38 +0200 Subject: [PATCH 4/7] Don't store 'floodgateVersion' in ConnectListener --- .../games647/fastlogin/bungee/listener/ConnectListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index bfb526d0..dab218d0 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -101,13 +101,11 @@ public class ConnectListener implements Listener { private final FastLoginBungee plugin; private final RateLimiter rateLimiter; private final Property[] emptyProperties = {}; - private final String floodgateVersion; private final FloodgateHook floodgateHook; public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter, String floodgateVersion) { this.plugin = plugin; this.rateLimiter = rateLimiter; - this.floodgateVersion = floodgateVersion; // Get the appropriate floodgate api hook based on the version if (floodgateVersion.startsWith("1")) { From c1cf80fe28be86890e6c0e948ea4dc21d37a9c6e Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:44:57 +0200 Subject: [PATCH 5/7] Remove 'initialHandlerClazzFound' from ConnectL... --- .../games647/fastlogin/bungee/listener/ConnectListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index dab218d0..ddc58a29 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -69,7 +69,6 @@ import org.slf4j.LoggerFactory; public class ConnectListener implements Listener { private static final String UUID_FIELD_NAME = "uniqueId"; - private static final boolean initialHandlerClazzFound; private static final MethodHandle uniqueIdSetter; static { @@ -94,7 +93,6 @@ public class ConnectListener implements Listener { reflectiveOperationException.printStackTrace(); } - initialHandlerClazzFound = handlerFound; uniqueIdSetter = setHandle; } From c0d21fdca255a87af1969fd1dfe6909e973ff749 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:48:01 +0200 Subject: [PATCH 6/7] Remove 'handlerFound' from ConnectListener --- .../games647/fastlogin/bungee/listener/ConnectListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index ddc58a29..ed4e9256 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -73,12 +73,10 @@ public class ConnectListener implements Listener { static { MethodHandle setHandle = null; - boolean handlerFound = false; try { Lookup lookup = MethodHandles.lookup(); Class.forName("net.md_5.bungee.connection.InitialHandler"); - handlerFound = true; Field uuidField = InitialHandler.class.getDeclaredField(UUID_FIELD_NAME); uuidField.setAccessible(true); From 9656aadb353b0061b40f405cecab3481cd422738 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:50:36 +0200 Subject: [PATCH 7/7] Remove unused imports --- .../com/github/games647/fastlogin/bukkit/FastLoginBukkit.java | 2 -- .../games647/fastlogin/bukkit/command/PremiumCommand.java | 1 - .../listener/protocolsupport/ProtocolSupportListener.java | 1 - .../com/github/games647/fastlogin/bungee/FastLoginBungee.java | 2 -- .../github/games647/fastlogin/bungee/hook/SodionAuthHook.java | 2 -- .../games647/fastlogin/bungee/listener/ConnectListener.java | 1 - .../games647/fastlogin/bungee/task/AsyncToggleMessage.java | 1 - 7 files changed, 10 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java index 067bd9b6..4e0a008c 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java @@ -48,12 +48,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.bukkit.Bukkit; -import org.bukkit.Server.Spigot; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.geysermc.floodgate.api.FloodgateApi; import org.slf4j.Logger; /** diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java index 72594519..8f511965 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java @@ -31,7 +31,6 @@ import com.github.games647.fastlogin.core.StoredProfile; import java.util.UUID; -import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent; import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent.PremiumToggleReason; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java index 6b3826b8..cb0823f0 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java @@ -37,7 +37,6 @@ import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent; import java.net.InetSocketAddress; import java.util.Optional; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java index 5630ca96..19c6c56a 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java @@ -59,8 +59,6 @@ import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.PluginManager; import net.md_5.bungee.api.scheduler.GroupedThreadFactory; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.slf4j.Logger; /** diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java index f22d3619..c12f2b08 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/SodionAuthHook.java @@ -32,8 +32,6 @@ import red.mohist.sodionauth.bungee.implementation.BungeePlayer; import red.mohist.sodionauth.core.SodionAuthApi; import red.mohist.sodionauth.core.exception.AuthenticatedException; -import java.util.concurrent.ExecutionException; - /** * GitHub: https://github.com/Mohist-Community/SodionAuth *

diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java index ed4e9256..8a81b142 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java @@ -58,7 +58,6 @@ import net.md_5.bungee.connection.LoginResult.Property; import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventPriority; -import org.geysermc.floodgate.FloodgateAPI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java index 05b78e57..0c8d3c5b 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java @@ -30,7 +30,6 @@ import com.github.games647.fastlogin.bungee.event.BungeeFastLoginPremiumToggleEv import com.github.games647.fastlogin.core.StoredProfile; import com.github.games647.fastlogin.core.shared.FastLoginCore; -import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent; import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent.PremiumToggleReason; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer;