foo.diff

commit 7e589ad71e01136fe6e2ffbccf95d2a7d0195ea9
Author: Aikar <aikar@aikar.co>
Date:   Mon Oct 26 19:46:52 2015 -0400

    reorder /p and fix cache issue

diff --git a/Empire/src/main/java/com/empireminecraft/commands/misc/PlayerInfoCommand.java b/Empire/src/main/java/com/empireminecraft/commands/misc/PlayerInfoCommand.java
index 2796e1b..31225cc 100644
--- a/Empire/src/main/java/com/empireminecraft/commands/misc/PlayerInfoCommand.java
+++ b/Empire/src/main/java/com/empireminecraft/commands/misc/PlayerInfoCommand.java
@@ -51,7 +51,7 @@ public class PlayerInfoCommand extends EmpireCommand {
             .currentFirstCallback(EmpireServer.getCurrentServerForUserTask(userLookup.userId))
             .async((server) -> {
                 EmpireUser user = userLookup;
-                if (!user.isOnline() && user.getTimeTillDerelict() < TimeUtil.DAY.inSeconds(15)) {
+                if (!user.isOnline()) {
                     user = EmpireUser.getUncachedUser(user.userId);
                 }
                 return PlayerInfoResult
@@ -64,30 +64,20 @@ public class PlayerInfoCommand extends EmpireCommand {
             EmpireUser user = info.getCurrentUser();
             String name = user.name;
             Util.sendMsg(sender, "&bInformation on Empire Minecraft player " + user.colorName);
-            Util.sendMsg(sender, " &bFirst Empire Sign-in:&f " + Util.prettyLastDate(user.firstLogin));
-
+            showPreviousNames(sender, user);
             showGroupInfo(sender, user, name);
             ResidenceManager.showDerelictStatus(sender, name, " &b");
-            showPreviousNames(sender, user);
             showVotingInfo(sender, user);
             ZombiePlague.showZombiePlaguePInfo(sender, user);
 
+            EmpireServer currentServer = null;
             if (user.extended().isBanned) {
                 showBanInfo(sender, user, now);
             } else {
-                EmpireServer currentServer = info.getCurrentServer();
-                if (currentServer != null) {
-                    Player p = Bukkit.getServer().getPlayerExact(name);
-                    if (user.isOnline()) {
-                        showCurrentStatus(sender, p);
-                        showCurrentLocInfo(sender, p);
-                    } else {
-                        Util.sendMsg(sender, " &bOnline Status:&f Connected to server " + currentServer.extraLabel);
-                    }
-                }
+                currentServer = info.getCurrentServer();
             }
+            showSeenInfo(sender, user, currentServer);
 
-            showLastSeenInfo(sender, user);
             if (user.isFriends(sender.getUserId())) {
                 Util.sendMsg(sender, " &bThis player is your friend.");
             }
@@ -157,20 +147,24 @@ public class PlayerInfoCommand extends EmpireCommand {
         }
     }
 
-    private static void showLastSeenInfo(Player sender, EmpireUser user) {
-        if (user.lastServer == EmpireServer.getServer()) {
-            Util.sendMsg(sender,
-                " &bLast Seen:&f " + Util.prettyLastDate(user.lastActivity) +
-                    " on this server (" +
-                    user.lastServer.extraLabel + ")"
-            );
+    private static void showSeenInfo(Player sender, EmpireUser user, EmpireServer currentServer) {
+        if (user.isOnline()) {
+            showCurrentStatus(sender, user.getPlayer());
+            showCurrentLocInfo(sender, user.getPlayer());
+        } else if (currentServer != null) {
+            Util.sendMsg(sender, " &bOnline Status:&f Connected to server " + currentServer.extraLabel);
         } else {
-            Util.sendMsg(sender,
-                " &bLast Seen:&f " + Util.prettyLastDate(user.lastActivity) +
-                    " on server " +
-                    user.lastServer.extraLabel
-            );
+            if (user.lastServer == EmpireServer.getServer()) {
+                Util.sendMsg(sender, " &bLast Seen:&f " + Util.prettyLastDate(user.lastActivity) +
+                        " on this server (" + user.lastServer.extraLabel + ")"
+                );
+            } else {
+                Util.sendMsg(sender, " &bLast Seen:&f " + Util.prettyLastDate(user.lastActivity) +
+                        " on server " + user.lastServer.extraLabel
+                );
+            }
         }
+        Util.sendMsg(sender, " &bFirst Empire Sign-in:&f " + Util.prettyLastDate(user.firstLogin));
     }
 
     private static void showCurrentLocInfo(Player sender, Player p) {World world = p.getWorld();