From d82f375506d7eaaf7d9604f1c70db060bf491bdd Mon Sep 17 00:00:00 2001 From: Tux Date: Fri, 15 Nov 2013 22:09:04 -0500 Subject: [PATCH] Enough commits for today! --- .../minecraft/redisbungee/RedisBungee.java | 69 +++++++------------ 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java index b31ba09..f7bfca9 100644 --- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java +++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java @@ -245,59 +245,42 @@ public class RedisBungee extends Plugin implements Listener { @EventHandler public void onPlayerConnect(final PostLoginEvent event) { - getProxy().getScheduler().runAsync(this, new Runnable() { - @Override - public void run() { - if (pool != null) { - Jedis rsc = pool.getResource(); - try { - rsc.sadd("server:" + configuration.getServerId() + ":usersOnline", event.getPlayer().getName()); - rsc.hset("player:" + event.getPlayer().getName(), "online", "0"); - } finally { - pool.returnResource(rsc); - } - // I used to have a task that eagerly waited for the user to be connected. - // Well, upon further inspection of BungeeCord's source code, this turned - // out to not be needed at all, since ServerConnectedEvent is called anyway. - } - } - }); + Jedis rsc = pool.getResource(); + try { + rsc.sadd("server:" + configuration.getServerId() + ":usersOnline", event.getPlayer().getName()); + rsc.hset("player:" + event.getPlayer().getName(), "online", "0"); + } finally { + pool.returnResource(rsc); + } + // I used to have a task that eagerly waited for the user to be connected. + // Well, upon further inspection of BungeeCord's source code, this turned + // out to not be needed at all, since ServerConnectedEvent is called anyway. } @EventHandler public void onPlayerDisconnect(final PlayerDisconnectEvent event) { - getProxy().getScheduler().runAsync(this, new Runnable() { - @Override - public void run() { - if (pool != null) { - Jedis rsc = pool.getResource(); - try { - rsc.srem("server:" + configuration.getServerId() + ":usersOnline", event.getPlayer().getName()); - rsc.hset("player:" + event.getPlayer().getName(), "online", String.valueOf(getUnixTimestamp())); - rsc.hdel("player:" + event.getPlayer().getName(), "server"); - } finally { - pool.returnResource(rsc); - } - } + if (pool != null) { + Jedis rsc = pool.getResource(); + try { + rsc.srem("server:" + configuration.getServerId() + ":usersOnline", event.getPlayer().getName()); + rsc.hset("player:" + event.getPlayer().getName(), "online", String.valueOf(getUnixTimestamp())); + rsc.hdel("player:" + event.getPlayer().getName(), "server"); + } finally { + pool.returnResource(rsc); } - }); + } } @EventHandler public void onServerChange(final ServerConnectedEvent event) { - getProxy().getScheduler().runAsync(this, new Runnable() { - @Override - public void run() { - if (pool != null) { - Jedis rsc = pool.getResource(); - try { - rsc.hset("player:" + event.getPlayer().getName(), "server", event.getServer().getInfo().getName()); - } finally { - pool.returnResource(rsc); - } - } + if (pool != null) { + Jedis rsc = pool.getResource(); + try { + rsc.hset("player:" + event.getPlayer().getName(), "server", event.getServer().getInfo().getName()); + } finally { + pool.returnResource(rsc); } - }); + } } @EventHandler