From 402b3b0d075a884a6489458811838e53f14c55c7 Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Wed, 16 Apr 2014 12:28:57 -0500
Subject: [PATCH] Always attempt to return a name before a uuid.

---
 src/main/java/com/massivecraft/factions/FPlayer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/factions/FPlayer.java b/src/main/java/com/massivecraft/factions/FPlayer.java
index 54068b81..6d657055 100644
--- a/src/main/java/com/massivecraft/factions/FPlayer.java
+++ b/src/main/java/com/massivecraft/factions/FPlayer.java
@@ -15,10 +15,12 @@ import com.massivecraft.factions.zcore.persist.PlayerEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 
 /**
@@ -300,7 +302,11 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
     }
 
     public String getName() {
-        return getPlayer() != null ? getPlayer().getName() : getId();
+        if(getPlayer() != null) {
+            return getPlayer().getName();
+        }
+        OfflinePlayer player = Bukkit.getOfflinePlayer(UUID.fromString(getId()));
+        return player.getName() != null ? player.getName() : getId();
     }
 
     public String getTag() {