From 1d99367956cc025c25b7c79ba9a9de3be3f1965a Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 20 May 2014 20:30:31 -0400
Subject: [PATCH] Revert vemacs for the 3rd time.

@vemacs, do not change this, or I will not only revoke your access to the repo, I will also skin you alive. Using "API" methods in this context is just fine and just because it doesn't suit your fancy doesn't mean you can just change it. I am the BDFL, obey me.
---
 .../com/imaginarycode/minecraft/redisbungee/RedisBungee.java    | 2 +-
 .../minecraft/redisbungee/RedisBungeeConsumer.java              | 2 +-
 .../java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
index 93778c3..63a2dc1 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@@ -57,7 +57,7 @@ public final class RedisBungee extends Plugin {
     @Getter
     private static Gson gson = new Gson();
     @Getter
-    private static String serverId;
+    private String serverId;
     
     private static RedisBungeeAPI api;
     private static PubSubListener psl = null;
diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java
index 296290a..3474cfb 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeConsumer.java
@@ -46,7 +46,7 @@ public class RedisBungeeConsumer implements Runnable {
     private void handle(ConsumerEvent event, Jedis jedis) {
         if (event instanceof PlayerLoggedInConsumerEvent) {
             PlayerLoggedInConsumerEvent event1 = (PlayerLoggedInConsumerEvent) event;
-            jedis.sadd("server:" + RedisBungee.getServerId() + ":usersOnline", event1.getPlayer().getUniqueId().toString());
+            jedis.sadd("server:" + RedisBungee.getApi().getServerId() + ":usersOnline", event1.getPlayer().getUniqueId().toString());
             jedis.hset("player:" + event1.getPlayer().getUniqueId().toString(), "online", "0");
             jedis.hset("player:" + event1.getPlayer().getUniqueId().toString(), "ip", event1.getPlayer().getAddress().getAddress().getHostAddress());
             jedis.hset("player:" + event1.getPlayer().getUniqueId().toString(), "name", event1.getPlayer().getName());
diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java
index 255bacf..e5fbf1a 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisUtil.java
@@ -10,7 +10,7 @@ import redis.clients.jedis.Jedis;
 
 public class RedisUtil {
     public static void cleanUpPlayer(String player, Jedis rsc) {
-        rsc.srem("server:" + RedisBungee.getServerId() + ":usersOnline", player);
+        rsc.srem("server:" + RedisBungee.getApi().getServerId() + ":usersOnline", player);
         rsc.hdel("player:" + player, "server");
         rsc.hdel("player:" + player, "ip");
     }