From 5a5cf016d9c01c0d4e8a1757429ef0e283ee6988 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sun, 29 Dec 2019 13:33:18 +0100
Subject: [PATCH] Remove on blacklist status on join too

---
 .travis.yml                                                | 2 +-
 bukkit/pom.xml                                             | 6 +++---
 .../fastlogin/bukkit/listener/ConnectionListener.java      | 7 ++++++-
 bungee/pom.xml                                             | 2 +-
 core/pom.xml                                               | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ba01d07..9093dd1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ language: java
 script: mvn test -B
 
 jdk:
-  - oraclejdk8
+  - openjdk8
   - openjdk11
 
 # Cache Maven dependencies
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index a2c5e402..4a0d5174 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -20,7 +20,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.4.0</version>
+            <version>4.44.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -153,7 +153,7 @@
         <dependency>
             <groupId>com.lenis0012.bukkit</groupId>
             <artifactId>loginsecurity</artifactId>
-            <version>2.1.9</version>
+            <version>3.0.1</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
index d8eaafa8..1b52b49d 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
@@ -38,6 +38,7 @@ public class ConnectionListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent joinEvent) {
         Player player = joinEvent.getPlayer();
 
+        removeBlacklistStatus(player);
         if (!plugin.isBungeeEnabled()) {
             //Wait before auth plugin and we received a message from BungeeCord initializes the player
             Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player);
@@ -48,9 +49,13 @@ public class ConnectionListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent quitEvent) {
         Player player = quitEvent.getPlayer();
-        player.removeMetadata(plugin.getName(), plugin);
+        removeBlacklistStatus(player);
 
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
         plugin.getPremiumPlayers().remove(player.getUniqueId());
     }
+
+    private void removeBlacklistStatus(Player player) {
+        player.removeMetadata(plugin.getName(), plugin);
+    }
 }
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 6667a041..056d74a4 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
diff --git a/core/pom.xml b/core/pom.xml
index efb6e606..a5c9c6b0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.3.1</version>
+            <version>3.4.1</version>
         </dependency>
 
         <!--Logging framework implements slf4j which is required by hikari-->