TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-08-13 06:27:01 +00:00
Code Issues Projects Releases Wiki Activity

Allow the 'userIsNotAway' and 'userIsAway' translation messages to be empty.

Browse source
This commit is contained in:
KHobbits 2012-11-04 21:49:48 +00:00
parent 4967279b8c
commit d674e65c11
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/User.java
View file

@ -70,8 +70,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
} }
return result; return result;
} }
private boolean isAuthorizedCheck(final String node) private boolean isAuthorizedCheck(final String node)
{ {
if (base instanceof OfflinePlayer) if (base instanceof OfflinePlayer)
@ -538,7 +538,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
if (broadcast && !isHidden()) if (broadcast && !isHidden())
{ {
setDisplayNick(); setDisplayNick();
ess.broadcastMessage(this, _("userIsNotAway", getDisplayName())); final String msg = _("userIsNotAway", getDisplayName());
if (!msg.isEmpty())
{
ess.broadcastMessage(this, msg);
}
} }
} }
lastActivity = System.currentTimeMillis(); lastActivity = System.currentTimeMillis();
@ -571,7 +575,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
if (!isHidden()) if (!isHidden())
{ {
setDisplayNick(); setDisplayNick();
ess.broadcastMessage(this, _("userIsAway", getDisplayName())); final String msg = _("userIsAway", getDisplayName());
if (!msg.isEmpty())
{
ess.broadcastMessage(this, msg);
}
} }
} }
} }

9
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View file

@ -32,12 +32,13 @@ public class Commandafk extends EssentialsCommand
private void toggleAfk(User user) private void toggleAfk(User user)
{ {
user.setDisplayNick(); user.setDisplayNick();
String msg = "";
if (!user.toggleAfk()) if (!user.toggleAfk())
{ {
//user.sendMessage(_("markedAsNotAway")); //user.sendMessage(_("markedAsNotAway"));
if (!user.isHidden()) if (!user.isHidden())
{ {
ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName())); msg = _("userIsNotAway", user.getDisplayName());
} }
user.updateActivity(false); user.updateActivity(false);
} }
@ -46,8 +47,12 @@ public class Commandafk extends EssentialsCommand
//user.sendMessage(_("markedAsAway")); //user.sendMessage(_("markedAsAway"));
if (!user.isHidden()) if (!user.isHidden())
{ {
ess.broadcastMessage(user, _("userIsAway", user.getDisplayName())); msg = _("userIsAway", user.getDisplayName());
} }
} }
if (!msg.isEmpty())
{
ess.broadcastMessage(user, msg);
}
} }
} }