From 0a2b43e7dc76c0a9bdd02b7b565df1f51e799e47 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sat, 26 Apr 2014 19:43:40 -0400
Subject: [PATCH] Make UUIDResolver properly deal with usernames

---
 .../minecraft/redisbungee/util/UUIDTranslator.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java
index e2f5ebb..2c1a810 100644
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/util/UUIDTranslator.java
@@ -16,6 +16,7 @@ import net.md_5.bungee.api.ProxyServer;
 import redis.clients.jedis.Jedis;
 
 import java.util.Collections;
+import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
@@ -53,14 +54,15 @@ public class UUIDTranslator {
             }
 
             // That didn't work. Let's ask Mojang.
-            uuid = UUIDFetcher.getUUIDOf(player);
-
-            if (uuid != null) {
-                uuidMap.put(player, uuid);
-                storeInfo(player, uuid, jedis);
+            for (Map.Entry<String, UUID> entry : new UUIDFetcher(Collections.singletonList(player)).call().entrySet()) {
+                if (entry.getKey().equalsIgnoreCase(player)) {
+                    uuidMap.put(player, entry.getValue());
+                    storeInfo(player, entry.getValue(), jedis);
+                    return entry.getValue();
+                }
             }
 
-            return uuid;
+            return null;
         } catch (Exception e) {
             plugin.getLogger().log(Level.SEVERE, "Unable to fetch UUID for " + player, e);
             return null;