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 397dd929..480e6d81 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 @@ -9,6 +9,8 @@ import com.github.games647.fastlogin.bukkit.listener.protocollib.SkinApplyListen import com.github.games647.fastlogin.bukkit.listener.protocolsupport.ProtocolSupportListener; import com.github.games647.fastlogin.bukkit.tasks.DelayedAuthHook; import com.github.games647.fastlogin.core.CommonUtil; +import com.github.games647.fastlogin.core.messages.ChangePremiumMessage; +import com.github.games647.fastlogin.core.messages.ChannelMessage; import com.github.games647.fastlogin.core.mojang.MojangApiConnector; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.PlatformPlugin; @@ -120,9 +122,10 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin optPlayer = getServer().getOnlinePlayers().stream().findFirst(); @@ -131,7 +134,9 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin { AuthPlugin authPlugin = plugin.getCore().getAuthPluginHook(); try { @@ -104,10 +112,11 @@ public class BungeeListener implements PluginMessageListener { Files.createFile(whitelistFile); } - return Files.lines(whitelistFile) - .map(String::trim) - .map(UUID::fromString) - .collect(toSet()); + try (Stream lines = Files.lines(whitelistFile)) { + return lines.map(String::trim) + .map(UUID::fromString) + .collect(toSet()); + } } catch (IOException ex) { plugin.getLog().error("Failed to create file for Proxy whitelist", ex); } catch (Exception ex) { diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java index d65b9b76..af9862b3 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java @@ -2,11 +2,11 @@ package com.github.games647.fastlogin.bukkit.tasks; import com.github.games647.fastlogin.bukkit.BukkitLoginSession; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; +import com.github.games647.fastlogin.core.messages.ChannelMessage; +import com.github.games647.fastlogin.core.messages.SuccessMessage; import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.ForceLoginManagement; import com.github.games647.fastlogin.core.shared.LoginSession; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; import java.util.concurrent.ExecutionException; @@ -39,10 +39,8 @@ public class ForceLoginTask extends ForceLoginManagement