From 88c5b6469497de0975670a59d9ef28f225705888 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 26 May 2013 16:51:40 +0100 Subject: GeoIP already has a perm, doesn't need hidden behind essentials.seen.extra as well. --- .../earth2me/essentials/commands/Commandseen.java | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index 8efda958f..8c34687ca 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -73,24 +73,23 @@ public class Commandseen extends EssentialsCommand if (user.isJailed()) { sender.sendMessage(_("whoisJail", (user.getJailTimeout() > 0 - ? Util.formatDateDiff(user.getJailTimeout()) - : _("true")))); + ? Util.formatDateDiff(user.getJailTimeout()) + : _("true")))); } if (user.isMuted()) { sender.sendMessage(_("whoisMuted", (user.getMuteTimeout() > 0 - ? Util.formatDateDiff(user.getMuteTimeout()) - : _("true")))); + ? Util.formatDateDiff(user.getMuteTimeout()) + : _("true")))); + } + final String location = user.getGeoLocation(); + if (location != null && (!(sender instanceof Player) || ess.getUser(sender).isAuthorized("essentials.geoip.show"))) + { + sender.sendMessage(_("whoisGeoLocation", location)); } if (extra) { sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString())); - final String location = user.getGeoLocation(); - if (location != null && (!(sender instanceof Player) || ess.getUser(sender).isAuthorized("essentials.geoip.show"))) - { - sender.sendMessage(_("whoisGeoLocation", location)); - } - } } @@ -109,17 +108,17 @@ public class Commandseen extends EssentialsCommand { sender.sendMessage(_("whoisBanned", showBan ? user.getBanReason() : _("true"))); } + final String location = user.getGeoLocation(); + if (location != null && (!(sender instanceof Player) || ess.getUser(sender).isAuthorized("essentials.geoip.show"))) + { + sender.sendMessage(_("whoisGeoLocation", location)); + } if (extra) { if (!user.getLastLoginAddress().isEmpty()) { sender.sendMessage(_("whoisIPAddress", user.getLastLoginAddress())); } - final String location = user.getGeoLocation(); - if (location != null && (!(sender instanceof Player) || ess.getUser(sender).isAuthorized("essentials.geoip.show"))) - { - sender.sendMessage(_("whoisGeoLocation", location)); - } final Location loc = user.getLogoutLocation(); if (loc != null) { -- cgit v1.2.3