Remove on blacklist status on join too

This commit is contained in:
games647
2019-12-29 13:33:18 +01:00
parent 2c7e569653
commit 5a5cf016d9
5 changed files with 12 additions and 7 deletions

View File

@@ -10,7 +10,7 @@ language: java
script: mvn test -B script: mvn test -B
jdk: jdk:
- oraclejdk8 - openjdk8
- openjdk11 - openjdk11
# Cache Maven dependencies # Cache Maven dependencies

View File

@@ -20,7 +20,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version> <version>3.2.0</version>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached> <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -107,7 +107,7 @@
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId> <artifactId>ProtocolLib</artifactId>
<version>4.4.0</version> <version>4.44.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -153,7 +153,7 @@
<dependency> <dependency>
<groupId>com.lenis0012.bukkit</groupId> <groupId>com.lenis0012.bukkit</groupId>
<artifactId>loginsecurity</artifactId> <artifactId>loginsecurity</artifactId>
<version>2.1.9</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
<exclusions> <exclusions>

View File

@@ -38,6 +38,7 @@ public class ConnectionListener implements Listener {
public void onPlayerJoin(PlayerJoinEvent joinEvent) { public void onPlayerJoin(PlayerJoinEvent joinEvent) {
Player player = joinEvent.getPlayer(); Player player = joinEvent.getPlayer();
removeBlacklistStatus(player);
if (!plugin.isBungeeEnabled()) { if (!plugin.isBungeeEnabled()) {
//Wait before auth plugin and we received a message from BungeeCord initializes the player //Wait before auth plugin and we received a message from BungeeCord initializes the player
Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player); Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player);
@@ -48,9 +49,13 @@ public class ConnectionListener implements Listener {
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent quitEvent) { public void onPlayerQuit(PlayerQuitEvent quitEvent) {
Player player = quitEvent.getPlayer(); Player player = quitEvent.getPlayer();
player.removeMetadata(plugin.getName(), plugin); removeBlacklistStatus(player);
plugin.getCore().getPendingConfirms().remove(player.getUniqueId()); plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
plugin.getPremiumPlayers().remove(player.getUniqueId()); plugin.getPremiumPlayers().remove(player.getUniqueId());
} }
private void removeBlacklistStatus(Player player) {
player.removeMetadata(plugin.getName(), plugin);
}
} }

View File

@@ -21,7 +21,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version> <version>3.2.0</version>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached> <shadedArtifactAttached>false</shadedArtifactAttached>

View File

@@ -33,7 +33,7 @@
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
<version>3.3.1</version> <version>3.4.1</version>
</dependency> </dependency>
<!--Logging framework implements slf4j which is required by hikari--> <!--Logging framework implements slf4j which is required by hikari-->