Merge branch 'release' of github.com:essentials/Essentials into 2.9

This commit is contained in:
KHobbits 2012-12-20 20:37:42 +00:00
commit 6f28540d59

View file

@ -35,12 +35,23 @@ public class Commandseen extends EssentialsCommand
} }
try try
{ {
User player = getPlayer(server, args, 0); User user = getPlayer(server, args, 0);
player.setDisplayNick(); user.setDisplayNick();
sender.sendMessage(_("seenOnline", player.getDisplayName(), Util.formatDateDiff(player.getLastLogin()))); sender.sendMessage(_("seenOnline", user.getDisplayName(), Util.formatDateDiff(user.getLastLogin())));
sender.sendMessage(_("whoisAFK", (user.isAfk() ? _("true") : _("false"))));
sender.sendMessage(_("whoisJail", (user.isJailed()
? user.getJailTimeout() > 0
? Util.formatDateDiff(user.getJailTimeout())
: _("true")
: _("false"))));
sender.sendMessage(_("whoisMuted", (user.isMuted()
? user.getMuteTimeout() > 0
? Util.formatDateDiff(user.getMuteTimeout())
: _("true")
: _("false"))));
if (extra) if (extra)
{ {
sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString())); sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
} }
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e)