diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-11-04 21:49:48 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-11-04 22:41:35 +0000 |
| commit | d674e65c1139707cf7f4be24e34809967f608937 (patch) | |
| tree | 2fb9808bbedd8c6a0405242bed595cc8a41da6dd | |
| parent | 4967279b8ce081b5bd9cd552bda0b7d7a9849f2e (diff) | |
| download | Essentials-d674e65c1139707cf7f4be24e34809967f608937.tar Essentials-d674e65c1139707cf7f4be24e34809967f608937.tar.gz Essentials-d674e65c1139707cf7f4be24e34809967f608937.tar.lz Essentials-d674e65c1139707cf7f4be24e34809967f608937.tar.xz Essentials-d674e65c1139707cf7f4be24e34809967f608937.zip | |
Allow the 'userIsNotAway' and 'userIsAway' translation messages to be empty.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 16 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandafk.java | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index f74e11f25..2aeeba0ac 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -70,8 +70,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser } return result; } - - private boolean isAuthorizedCheck(final String node) + + private boolean isAuthorizedCheck(final String node) { if (base instanceof OfflinePlayer) @@ -538,7 +538,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser if (broadcast && !isHidden()) { setDisplayNick(); - ess.broadcastMessage(this, _("userIsNotAway", getDisplayName())); + final String msg = _("userIsNotAway", getDisplayName()); + if (!msg.isEmpty()) + { + ess.broadcastMessage(this, msg); + } } } lastActivity = System.currentTimeMillis(); @@ -571,7 +575,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser if (!isHidden()) { setDisplayNick(); - ess.broadcastMessage(this, _("userIsAway", getDisplayName())); + final String msg = _("userIsAway", getDisplayName()); + if (!msg.isEmpty()) + { + ess.broadcastMessage(this, msg); + } } } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index c71883571..6a5d6dc26 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -32,12 +32,13 @@ public class Commandafk extends EssentialsCommand private void toggleAfk(User user) { user.setDisplayNick(); + String msg = ""; if (!user.toggleAfk()) { //user.sendMessage(_("markedAsNotAway")); if (!user.isHidden()) { - ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName())); + msg = _("userIsNotAway", user.getDisplayName()); } user.updateActivity(false); } @@ -46,8 +47,12 @@ public class Commandafk extends EssentialsCommand //user.sendMessage(_("markedAsAway")); if (!user.isHidden()) { - ess.broadcastMessage(user, _("userIsAway", user.getDisplayName())); + msg = _("userIsAway", user.getDisplayName()); } } + if (!msg.isEmpty()) + { + ess.broadcastMessage(user, msg); + } } } |