Skip to content

Commit 72fad69

Browse files
authored
Move UUID below alts in /seen (EssentialsX#4615)
1 parent 07f45b7 commit 72fad69

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,16 @@ private void seenOnline(final CommandSource sender, final User user, final boole
102102

103103
user.setDisplayNick();
104104
sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin())));
105-
if (sender.isAuthorized("essentials.seen.uuid", ess)) {
106-
sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId().toString()));
107-
}
108105

109106
final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
110107
if (history != null && history.size() > 1) {
111108
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
112109
}
113110

111+
if (sender.isAuthorized("essentials.seen.uuid", ess)) {
112+
sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId().toString()));
113+
}
114+
114115
if (user.isAfk()) {
115116
sender.sendMessage(tl("whoisAFK", tl("true")));
116117
}
@@ -138,18 +139,18 @@ private void seenOffline(final CommandSource sender, final User user, final bool
138139
user.setDisplayNick();
139140
if (user.getLastLogout() > 0) {
140141
sender.sendMessage(tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout())));
142+
final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
143+
if (history != null && history.size() > 1) {
144+
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
145+
}
146+
141147
if (sender.isAuthorized("essentials.seen.uuid", ess)) {
142148
sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId()));
143149
}
144150
} else {
145151
sender.sendMessage(tl("userUnknown", user.getName()));
146152
}
147153

148-
final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
149-
if (history != null && history.size() > 1) {
150-
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
151-
}
152-
153154
if (BanLookup.isBanned(ess, user)) {
154155
final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName());
155156
final String reason = showBan ? banEntry.getReason() : tl("true");

0 commit comments

Comments
 (0)