TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-01-05 23:08:23 +00:00
Code Issues Projects Releases Wiki Activity

Move UUID below alts in /seen (#4615)

Browse source
This commit is contained in:
Josh Roy 2021-11-06 16:50:56 -04:00 committed by GitHub
parent e4cf965bae
commit 86d435eee1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
View file

@ -102,15 +102,16 @@ public class Commandseen extends EssentialsCommand {
user.setDisplayNick(); user.setDisplayNick();
sender.sendMessage(tl("seenOnline", user.getDisplayName(), DateUtil.formatDateDiff(user.getLastLogin()))); 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()); final List<String> history = ess.getUserMap().getUserHistory(user.getBase().getUniqueId());
if (history != null && history.size() > 1) { if (history != null && history.size() > 1) {
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history))); 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()) { if (user.isAfk()) {
sender.sendMessage(tl("whoisAFK", tl("true"))); sender.sendMessage(tl("whoisAFK", tl("true")));
} }
@ -138,6 +139,11 @@ public class Commandseen extends EssentialsCommand {
user.setDisplayNick(); user.setDisplayNick();
if (user.getLastLogout() > 0) { if (user.getLastLogout() > 0) {
sender.sendMessage(tl("seenOffline", user.getName(), DateUtil.formatDateDiff(user.getLastLogout()))); 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)) { if (sender.isAuthorized("essentials.seen.uuid", ess)) {
sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId())); sender.sendMessage(tl("whoisUuid", user.getBase().getUniqueId()));
} }
@ -145,11 +151,6 @@ public class Commandseen extends EssentialsCommand {
sender.sendMessage(tl("userUnknown", user.getName())); 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)) { if (BanLookup.isBanned(ess, user)) {
final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName()); final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName());
final String reason = showBan ? banEntry.getReason() : tl("true"); final String reason = showBan ? banEntry.getReason() : tl("true");