From aeef4d69c2f58f78d326f51d49eda472dbb5f9f1 Mon Sep 17 00:00:00 2001
From: Nick Porillo <nsporillo@gmail.com>
Date: Tue, 12 May 2015 23:14:51 -0400
Subject: [PATCH] Fix last seen variable

---
 .../java/com/massivecraft/factions/cmd/FCmdRoot.java     | 4 +++-
 .../massivecraft/factions/zcore/util/TagReplacer.java    | 9 ++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
index 8d4b68a9..8f83516c 100644
--- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
+++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java
@@ -47,6 +47,7 @@ public class FCmdRoot extends FCommand {
     public CmdSethome cmdSethome = new CmdSethome();
     public CmdShow cmdShow = new CmdShow();
     public CmdStatus cmdStatus = new CmdStatus();
+    public CmdStuck cmdStuck = new CmdStuck();
     public CmdTag cmdTag = new CmdTag();
     public CmdTitle cmdTitle = new CmdTitle();
     public CmdToggleAllianceChat cmdToggleAllianceChat = new CmdToggleAllianceChat();
@@ -125,10 +126,11 @@ public class FCmdRoot extends FCommand {
         this.addSubCommand(this.cmdRelationNeutral);
         this.addSubCommand(this.cmdReload);
         this.addSubCommand(this.cmdSafeunclaimall);
-        this.addSubCommand(this.cmdSaveAll);
+        this.addSubCommand(this.cmdSaveAll); 
         this.addSubCommand(this.cmdSethome);
         this.addSubCommand(this.cmdShow);
         this.addSubCommand(this.cmdStatus);
+        this.addSubCommand(this.cmdStuck);
         this.addSubCommand(this.cmdTag);
         this.addSubCommand(this.cmdTitle);
         this.addSubCommand(this.cmdUnclaim);
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java b/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java
index f40bd589..f74a5728 100644
--- a/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/util/TagReplacer.java
@@ -6,7 +6,6 @@ import com.massivecraft.factions.struct.Relation;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -139,12 +138,8 @@ public enum TagReplacer {
                 case FACTION:
                     return !fac.isNone() ? fac.getTag(fp) : TL.GENERIC_FACTIONLESS.toString();
                 case LAST_SEEN:
-                    long lastSeen = System.currentTimeMillis() - fp.getLastLoginTime();
-                    String humanized = DurationFormatUtils.formatDurationWords(lastSeen, true, true) + TL.COMMAND_STATUS_AGOSUFFIX;
-                    String last = fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() :
-                            (lastSeen < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);
-                    return String.format(TL.COMMAND_STATUS_FORMAT.toString(),
-                            ChatColor.GOLD + fp.getRole().getPrefix() + fp.getName() + ChatColor.RESET, last).trim();
+                    String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fp.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX;
+                    return fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fp.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);
                 case PLAYER_GROUP:
                     return P.p.getPrimaryGroup(Bukkit.getOfflinePlayer(UUID.fromString(fp.getId())));
                 case PLAYER_BALANCE: