From 71c1f4f12e64c06aa1acb11fa427fd3317c4cd1d Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sun, 18 Mar 2018 16:22:03 +0100
Subject: [PATCH] Remove session in ProtocolSupport directly without expiring

---
 .../games647/fastlogin/bukkit/BukkitLoginSession.java      | 4 ++++
 .../github/games647/fastlogin/bukkit/FastLoginBukkit.java  | 2 +-
 .../listener/protocolsupport/ProtocolSupportListener.java  | 7 +++++++
 .../fastlogin/bungee/listener/MessageListener.java         | 2 +-
 .../fastlogin/core/messages/ChangePremiumMessage.java      | 4 ++--
 5 files changed, 15 insertions(+), 4 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 e67bfc52..dc458373 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
@@ -51,12 +51,16 @@ public class BukkitLoginSession extends LoginSession {
         return ArrayUtils.clone(verifyToken);
     }
 
+    /**
+     * @return premium skin if available
+     */
     public synchronized Optional<SkinProperty> getSkin() {
         return Optional.ofNullable(skinProperty);
     }
 
     /**
      * Sets the premium skin property which was retrieved by the session server
+     * @param skinProperty premium skin
      */
     public synchronized void setSkinProperty(SkinProperty skinProperty) {
         this.skinProperty = skinProperty;
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 bcae4e39..e0fe7a83 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
@@ -152,7 +152,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
      * Wait before the server is fully started. This is workaround, because connections right on startup are not
      * injected by ProtocolLib
      *
-     * @return
+     * @return true if ProtocolLib can now intercept packets
      */
     public boolean isServerFullyStarted() {
         return serverStarted;
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 9d7db6c6..fe1234b4 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
@@ -12,6 +12,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import protocolsupport.api.events.ConnectionCloseEvent;
 import protocolsupport.api.events.PlayerLoginStartEvent;
 import protocolsupport.api.events.PlayerPropertiesResolveEvent;
 
@@ -41,6 +42,12 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
         super.onLogin(username, new ProtocolLoginSource(loginStartEvent));
     }
 
+    @EventHandler
+    public void onConnectionClosed(ConnectionCloseEvent closeEvent) {
+        InetSocketAddress address = closeEvent.getConnection().getAddress();
+        plugin.getLoginSessions().remove(address.toString());
+    }
+
     @EventHandler
     public void onPropertiesResolve(PlayerPropertiesResolveEvent propertiesResolveEvent) {
         InetSocketAddress address = propertiesResolveEvent.getAddress();
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java
index ff4b0d73..a3fc07fb 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/MessageListener.java
@@ -64,7 +64,7 @@ public class MessageListener implements Listener {
 
             String playerName = changeMessage.getPlayerName();
             boolean isSourceInvoker = changeMessage.isSourceInvoker();
-            if (changeMessage.isWillEnable()) {
+            if (changeMessage.shouldEnable()) {
                 if (playerName.equals(forPlayer.getName()) && plugin.getCore().getConfig().get("premium-warning", true)
                         && !core.getPendingConfirms().contains(forPlayer.getUniqueId())) {
                     String message = core.getMessage("premium-warning");
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java b/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java
index da30da0c..9e81065e 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/messages/ChangePremiumMessage.java
@@ -23,7 +23,7 @@ public class ChangePremiumMessage implements ChannelMessage {
         return playerName;
     }
 
-    public boolean isWillEnable() {
+    public boolean shouldEnable() {
         return willEnable;
     }
 
@@ -54,7 +54,7 @@ public class ChangePremiumMessage implements ChannelMessage {
     public String toString() {
         return this.getClass().getSimpleName() + '{' +
                 "playerName='" + playerName + '\'' +
-                ", willEnable=" + willEnable +
+                ", shouldEnable=" + willEnable +
                 ", isSourceInvoker=" + isSourceInvoker +
                 '}';
     }