TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Run seen fallback code asynchronously, and clean it up

Browse source
This commit is contained in:
vemacs 2016-03-01 08:36:41 -07:00
parent f94e242a75
commit 5968a6bc27
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,15 +27,16 @@ public class Commandseen extends EssentialsCommand {
@Override @Override
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
seen(server, sender, args, true, true, true); seen(server, sender, commandLabel, args, true, true, true);
} }
@Override @Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
seen(server, user.getSource(), args, user.isAuthorized("essentials.seen.banreason"), user.isAuthorized("essentials.seen.extra"), user.isAuthorized("essentials.seen.ipsearch")); seen(server, user.getSource(), commandLabel, args, user.isAuthorized("essentials.seen.banreason"), user.isAuthorized("essentials.seen.extra"), user.isAuthorized("essentials.seen.ipsearch"));
} }
protected void seen(final Server server, final CommandSource sender, final String[] args, final boolean showBan, final boolean extra, final boolean ipLookup) throws Exception { protected void seen(final Server server, final CommandSource sender, final String commandLabel, final String[] args,
final boolean showBan, final boolean extra, final boolean ipLookup) throws Exception {
if (args.length < 1) { if (args.length < 1) {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
@ -58,25 +59,40 @@ public class Commandseen extends EssentialsCommand {
} else if (BanLookup.isBanned(ess, args[0])) { } else if (BanLookup.isBanned(ess, args[0])) {
sender.sendMessage(tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : tl("true"))); sender.sendMessage(tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : tl("true")));
return; return;
} else { }
ess.getScheduler().runTaskAsynchronously(ess, new Runnable() {
@Override
public void run() {
User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]); User userFromBukkit = ess.getUserMap().getUserFromBukkit(args[0]);
if (userFromBukkit != null) {
player = userFromBukkit;
} else {
try { try {
player = getPlayer(server, sender, args, 0); if (userFromBukkit != null) {
} catch (NoSuchFieldException e) { showUserSeen(userFromBukkit);
} else {
showUserSeen(getPlayer(server, sender, args, 0));
}
} catch (Exception e) {
ess.showError(sender, e, commandLabel);
}
}
private void showUserSeen(User user) throws Exception {
if (user == null) {
throw new PlayerNotFoundException(); throw new PlayerNotFoundException();
} }
showSeenMessage(server, sender, user, showBan, extra);
}
});
} else {
showSeenMessage(server, sender, player, showBan, extra);
} }
} }
}
private void showSeenMessage(Server server, CommandSource sender, User player, boolean showBan, boolean extra) throws Exception {
if (player.getBase().isOnline() && canInteractWith(sender, player)) { if (player.getBase().isOnline() && canInteractWith(sender, player)) {
seenOnline(server, sender, player, showBan, extra); seenOnline(server, sender, player, showBan, extra);
} else { } else {
seenOffline(server, sender, player, showBan, extra); seenOffline(server, sender, player, showBan, extra);
} }
} }
private void seenOnline(final Server server, final CommandSource sender, final User user, final boolean showBan, final boolean extra) throws Exception { private void seenOnline(final Server server, final CommandSource sender, final User user, final boolean showBan, final boolean extra) throws Exception {