From 099b8e5d0a02b9d01e451dffce6a85754cac7f15 Mon Sep 17 00:00:00 2001 From: games647 Date: Sat, 5 Mar 2016 21:04:22 +0100 Subject: [PATCH] Fix weird 1.9 bugs --- .../github/games647/fastlogin/bukkit/FastLoginBukkit.java | 2 +- .../fastlogin/bukkit/listener/BukkitJoinListener.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) 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 44fefbc2..534af7ff 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 @@ -47,7 +47,7 @@ public class FastLoginBukkit extends JavaPlugin { //SafeCacheBuilder is used in order to be version independent private final ConcurrentMap session = SafeCacheBuilder.newBuilder() //2 minutes should be enough as a timeout for bad internet connection (Server, Client and Mojang) - .expireAfterWrite(30, TimeUnit.SECONDS) + .expireAfterWrite(1, TimeUnit.MINUTES) //mapped by ip:port -> PlayerSession .build(new CacheLoader() { diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java index 0d3a8cae..d0a98fb7 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java @@ -34,7 +34,8 @@ public class BukkitJoinListener implements Listener { public void onPlayerJoin(PlayerJoinEvent joinEvent) { final Player player = joinEvent.getPlayer(); - PlayerSession session = plugin.getSessions().get(player.getAddress().toString()); + //removing the session because we now use it + final PlayerSession session = plugin.getSessions().remove(player.getAddress().toString()); if (session != null) { WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player); WrappedSignedProperty skin = session.getSkin(); @@ -47,10 +48,6 @@ public class BukkitJoinListener implements Listener { @Override public void run() { - String address = player.getAddress().toString(); - //removing the session because we now use it - PlayerSession session = plugin.getSessions().remove(address); - if (player.isOnline()) { //blacklist this target player for BungeeCord Id brute force attacks player.setMetadata(plugin.getName(), new FixedMetadataValue(plugin, true));