From 93744f937e9aa4db976b24135e0c7444bf12aaf3 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 20 Jan 2014 18:42:56 -0500
Subject: [PATCH] oh god vemacs

---
 .../minecraft/redisbungee/RedisBungee.java    | 67 +++++++++++--------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
index d5f4f7c..903a1e5 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@@ -190,8 +190,21 @@ public final class RedisBungee extends Plugin implements Listener {
             try {
                 tmpRsc.set("server:" + configuration.getString("server-id") + ":playerCount", "0"); // reset
                 if (tmpRsc.scard("server:" + configuration.getString("server-id") + ":usersOnline") > 0) {
-                    for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline"))
-                        cleanUpPlayer(member, tmpRsc);
+                    for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline")) {
+                        // Are they simply on a different proxy?
+                        boolean found = false;
+                        for (String proxyId : configuration.getStringList("linked-servers")) {
+                            if (proxyId.equals(configuration.getString("server-id"))) continue;
+                            if (tmpRsc.sismember("server:" + proxyId + ":usersOnline", member)) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found)
+                            cleanUpPlayer(member, tmpRsc);
+                        else
+                            tmpRsc.srem("server:" + configuration.getString("server-id") + ":usersOnline", member);
+                    }
                 }
             } finally {
                 pool.returnResource(tmpRsc);
@@ -218,15 +231,33 @@ public final class RedisBungee extends Plugin implements Listener {
             psl = new PubSubListener();
             new Thread(psl, "RedisBungee PubSub Listener").start();
             getProxy().getScheduler().schedule(this, new Runnable() {
-                final Random random = new Random();
-                final Thread psc = new Thread(new PlayerSetCheck(), "RedisBungee PlayerSetCheck Task");
-
                 @Override
                 public void run() {
+                    Jedis tmpRsc = pool.getResource();
                     try {
-                        Thread.sleep(60000 * (1 + random.nextInt(3)));
-                        psc.start();
-                    } catch (InterruptedException ignored) {
+                        Set<String> players = getLocalPlayers();
+                        for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline"))
+                            if (!players.contains(member)) {
+                                // Are they simply on a different proxy?
+                                boolean found = false;
+                                for (String proxyId : configuration.getStringList("linked-servers")) {
+                                    if (proxyId.equals(configuration.getString("server-id"))) continue;
+                                    if (tmpRsc.sismember("server:" + proxyId + ":usersOnline", member)) {
+                                        // Just clean up the set.
+                                        found = true;
+                                        break;
+                                    }
+                                }
+                                if (!found) {
+                                    cleanUpPlayer(member, tmpRsc);
+                                    getLogger().warning("Player found in set that was not found locally and globally: " + member);
+                                } else {
+                                    tmpRsc.srem("server:" + configuration.getString("server-id") + ":usersOnline", member);
+                                    getLogger().warning("Player found in set that was not found locally, but is on another proxy: " + member);
+                                }
+                            }
+                    } finally {
+                        pool.returnResource(tmpRsc);
                     }
                 }
             }, 1, 5, TimeUnit.MINUTES);
@@ -516,24 +547,4 @@ public final class RedisBungee extends Plugin implements Listener {
         public void onPSubscribe(String s, int i) {
         }
     }
-
-    private class PlayerSetCheck implements Runnable {
-        private PlayerSetCheck() {
-        }
-
-        @Override
-        public void run() {
-            Jedis tmpRsc = pool.getResource();
-            try {
-                Set<String> players = getLocalPlayers();
-                for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline"))
-                    if (!players.contains(member)) {
-                        cleanUpPlayer(member, tmpRsc);
-                        getLogger().warning("Player found in set that was not found locally: " + member);
-                    }
-            } finally {
-                pool.returnResource(tmpRsc);
-            }
-        }
-    }
 }