From 86d435eee10a156287167cf8e9d84fd11c64de6c Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sat, 6 Nov 2021 16:50:56 -0400
Subject: [PATCH] Move UUID below alts in /seen (#4615)

---
 .../essentials/commands/Commandseen.java        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
index c293e7e47..378d69333 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
@@ -102,15 +102,16 @@ public class Commandseen extends EssentialsCommand {
 
         user.setDisplayNick();
         sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin())));
-        if (sender.isAuthorized("essentials.seen.uuid", ess)) {
-            sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId().toString()));
-        }
 
         final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
         if (history != null && history.size() > 1) {
             sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
         }
 
+        if (sender.isAuthorized("essentials.seen.uuid", ess)) {
+            sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId().toString()));
+        }
+
         if (user.isAfk()) {
             sender.sendMessage(tl("whoisAFK", tl("true")));
         }
@@ -138,6 +139,11 @@ public class Commandseen extends EssentialsCommand {
         user.setDisplayNick();
         if (user.getLastLogout() > 0) {
             sender.sendMessage(tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout())));
+            final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
+            if (history != null && history.size() > 1) {
+                sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
+            }
+
             if (sender.isAuthorized("essentials.seen.uuid", ess)) {
                 sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId()));
             }
@@ -145,11 +151,6 @@ public class Commandseen extends EssentialsCommand {
             sender.sendMessage(tl("userUnknown", user.getName()));
         }
 
-        final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
-        if (history != null && history.size() > 1) {
-            sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
-        }
-
         if (BanLookup.isBanned(ess, user)) {
             final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName());
             final String reason = showBan ? banEntry.getReason() : tl("true");