diff options
Diffstat (limited to 'Essentials/src/net/ess3/commands/Commandseen.java')
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandseen.java | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java index d48ede62b..9c5889bdd 100644 --- a/Essentials/src/net/ess3/commands/Commandseen.java +++ b/Essentials/src/net/ess3/commands/Commandseen.java @@ -1,13 +1,12 @@ package net.ess3.commands; -import lombok.Cleanup; import static net.ess3.I18n._; + import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import net.ess3.storage.Location; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; -import org.bukkit.command.CommandSender; +import lombok.Cleanup; public class Commandseen extends EssentialsCommand @@ -15,16 +14,16 @@ public class Commandseen extends EssentialsCommand @Override protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - seen(sender,args,true, true); + seen(sender,args,true); } @Override protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception { - seen(user,args,Permissions.SEEN_BANREASON.isAuthorized(user), Permissions.SEEN_EXTRA.isAuthorized(user)); + seen(user,args,Permissions.SEEN_BANREASON.isAuthorized(user)); } - protected void seen (final CommandSender sender, final String[] args, final boolean showBan, final boolean extra) throws Exception + protected void seen (final CommandSender sender, final String[] args, final boolean show) throws Exception { if (args.length < 1) { @@ -32,36 +31,22 @@ public class Commandseen extends EssentialsCommand } try { - IUser player = getPlayer(args, 0); - player.setDisplayNick(); - sender.sendMessage(_("seenOnline", player.getDisplayName(), DateUtil.formatDateDiff(player.getTimestamp(TimestampType.LOGIN)))); - if (extra) - { - sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString())); - } + IUser u = getPlayer(args, 0); + sender.sendMessage(_("seenOnline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN)))); } catch (NoSuchFieldException e) { @Cleanup - IUser player = ess.getUser(args[0]); - player.acquireReadLock(); - if (player == null) + IUser u = ess.getUser(args[0]); + u.acquireReadLock(); + if (u == null) { throw new Exception(_("playerNotFound")); } - player.setDisplayNick(); - sender.sendMessage(_("seenOffline", player.getName(), DateUtil.formatDateDiff(player.getTimestamp(TimestampType.LOGOUT)))); - if (player.isBanned()) - { - sender.sendMessage(_("whoisBanned", showBan ? player.getData().getBan().getReason() : _("true"))); - } - if (extra) + sender.sendMessage(_("seenOffline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT)))); + if (u.isBanned()) { - sender.sendMessage(_("whoisIPAddress", player.getData().getIpAddress())); - final Location loc = player.getData().getLastLocation(); - if (loc != null) { - sender.sendMessage(_("whoisLocation", loc.getWorldName(), loc.getX(), loc.getY(), loc.getZ())); - } + sender.sendMessage(_("whoisBanned", show ? u.getData().getBan().getReason() : _("true"))); } } } |