From 413a0325f89350b54de9f11044bc561cf8fae0a5 Mon Sep 17 00:00:00 2001
From: games647 <games@tsprivat.de>
Date: Sat, 11 Jun 2016 13:24:35 +0200
Subject: [PATCH] Fixed BungeeCord force logins if there is a lobby server

---
 CHANGELOG.md                                              | 4 ++++
 bukkit/pom.xml                                            | 2 +-
 bungee/pom.xml                                            | 8 +-------
 .../bungee/listener/PlayerConnectionListener.java         | 7 +++++++
 .../games647/fastlogin/bungee/tasks/ForceLoginTask.java   | 2 +-
 core/pom.xml                                              | 2 +-
 pom.xml                                                   | 2 +-
 universal/pom.xml                                         | 2 +-
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7222723..db7ee059 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+######1.5.2
+
+* Fixed BungeeCord force logins if there is a lobby server
+
 ######1.5.1
 
 * Fixed BungeeCord support by correctly saving the proxy ids
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 14a27a26..46a51f5d 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 83f78335..4e7ca96f 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,12 +17,6 @@
     <name>FastLoginBungee</name>
 
     <repositories>
-        <!--Waterfall-->
-<!--        <repository>
-            <id>ellune-releases</id>
-            <url>https://repo.ellune.net/content/repositories/snapshots/</url>
-        </repository>-->
-
         <!--BungeeCord with also the part outside the API-->
         <repository>
             <id>RYRED-REPO</id>
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java
index c59bd27f..aed689c5 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java
@@ -14,6 +14,7 @@ import java.util.logging.Level;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.event.PreLoginEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
@@ -88,4 +89,10 @@ public class PlayerConnectionListener implements Listener {
         ForceLoginTask loginTask = new ForceLoginTask(plugin, player, serverConnectedEvent.getServer());
         ProxyServer.getInstance().getScheduler().runAsync(plugin, loginTask);
     }
+
+    @EventHandler
+    public void onServerConnected(PlayerDisconnectEvent disconnectEvent) {
+        ProxiedPlayer player = disconnectEvent.getPlayer();
+        plugin.getSession().remove(player.getPendingConnection());
+    }
 }
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java
index fe0d1113..e92be210 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/tasks/ForceLoginTask.java
@@ -28,7 +28,7 @@ public class ForceLoginTask implements Runnable {
     @Override
     public void run() {
         PendingConnection pendingConnection = player.getPendingConnection();
-        LoginSession session = plugin.getSession().remove(pendingConnection);
+        LoginSession session = plugin.getSession().get(pendingConnection);
         PlayerProfile playerProfile = session.getProfile();
 
         //force login only on success
diff --git a/core/pom.xml b/core/pom.xml
index 93e158eb..ec1fed85 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index fe05cbb4..58d188da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <name>FastLogin</name>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <inceptionYear>2015</inceptionYear>
     <url>https://www.spigotmc.org/resources/fastlogin.14153/</url>
     <description>
diff --git a/universal/pom.xml b/universal/pom.xml
index c684ad04..8f2f2615 100644
--- a/universal/pom.xml
+++ b/universal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>