summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-05-26 16:51:40 +0100
committerKHobbits <rob@khobbits.co.uk>2013-05-26 16:52:25 +0100
commit88c5b6469497de0975670a59d9ef28f225705888 (patch)
treedf60b2b2a1ee618e89ede24e9d6f98bb7b7024a4
parent19451c151ed02c57f3208901e6a33f6a3392f409 (diff)
downloadEssentials-88c5b6469497de0975670a59d9ef28f225705888.tar
Essentials-88c5b6469497de0975670a59d9ef28f225705888.tar.gz
Essentials-88c5b6469497de0975670a59d9ef28f225705888.tar.lz
Essentials-88c5b6469497de0975670a59d9ef28f225705888.tar.xz
Essentials-88c5b6469497de0975670a59d9ef28f225705888.zip
GeoIP already has a perm, doesn't need hidden behind essentials.seen.extra as well.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandseen.java29
1 files 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)
{