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/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); } 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/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) { 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 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..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; @@ -69,17 +68,14 @@ 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 { 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); @@ -94,20 +90,17 @@ public class ConnectListener implements Listener { reflectiveOperationException.printStackTrace(); } - initialHandlerClazzFound = handlerFound; uniqueIdSetter = setHandle; } 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")) { 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;