diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-10-04 07:21:09 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-10-04 07:21:09 +0100 |
commit | fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f (patch) | |
tree | 5e09101b480d312602ccec434c7eb9e80f5875dd | |
parent | c97e69cd71afe34812fcbbe6af33ce92eff1218f (diff) | |
download | Essentials-fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f.tar Essentials-fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f.tar.gz Essentials-fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f.tar.lz Essentials-fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f.tar.xz Essentials-fd43a6898eccccf7cbf9c21aeb4b50b7a1b4f26f.zip |
Adding list name to /nick support.
3 files changed, 15 insertions, 9 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 2f690910f..ddf0a6806 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -46,11 +46,11 @@ public class EssentialsPlayerListener extends PlayerListener public void onPlayerRespawn(final PlayerRespawnEvent event) { final User user = ess.getUser(event.getPlayer()); - user.setDisplayName(user.getNick()); + user.setDisplayNick(user.getNick()); updateCompass(user); if (ess.getSettings().changeDisplayName()) { - user.setDisplayName(user.getNick()); + user.setDisplayNick(user.getNick()); } } @@ -76,7 +76,7 @@ public class EssentialsPlayerListener extends PlayerListener user.updateActivity(true); if (ess.getSettings().changeDisplayName()) { - user.setDisplayName(user.getNick()); + user.setDisplayNick(user.getNick()); } } @@ -262,7 +262,7 @@ public class EssentialsPlayerListener extends PlayerListener if (ess.getSettings().changeDisplayName()) { - user.setDisplayName(user.getNick()); + user.setDisplayNick(user.getNick()); } user.updateActivity(false); if (user.isAuthorized("essentials.sleepingignored")) @@ -351,7 +351,7 @@ public class EssentialsPlayerListener extends PlayerListener final User user = ess.getUser(event.getPlayer()); if (ess.getSettings().changeDisplayName()) { - user.setDisplayName(user.getNick()); + user.setDisplayNick(user.getNick()); } updateCompass(user); } diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index b68e93656..fe811e50f 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -282,6 +282,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser return nickname.toString(); } + + public void setDisplayNick(String name) + { + setDisplayName(name); + setPlayerListName(name); + } public Teleport getTeleport() { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java index 253ec7646..f2165aebc 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandnick.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandnick.java @@ -41,7 +41,7 @@ public class Commandnick extends EssentialsCommand String nick = args[0]; if ("off".equalsIgnoreCase(nick) || user.getName().equalsIgnoreCase(nick)) { - user.setDisplayName(user.getName()); + user.setDisplayNick(user.getName()); user.setNickname(null); user.sendMessage(Util.i18n("nickNoMore")); return; @@ -67,7 +67,7 @@ public class Commandnick extends EssentialsCommand } } - user.setDisplayName(ess.getSettings().getNicknamePrefix() + nick); + user.setDisplayNick(ess.getSettings().getNicknamePrefix() + nick); user.setNickname(nick); user.sendMessage(Util.format("nickSet", user.getDisplayName() + "§7.")); } @@ -95,13 +95,13 @@ public class Commandnick extends EssentialsCommand String nick = args[1]; if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick)) { - target.setDisplayName(target.getName()); + target.setDisplayNick(target.getName()); target.setNickname(null); target.sendMessage(Util.i18n("nickNoMore")); } else { - target.setDisplayName(ess.getSettings().getNicknamePrefix() + nick); + target.setDisplayNick(ess.getSettings().getNicknamePrefix() + nick); target.setNickname(nick); target.sendMessage(Util.format("nickSet", target.getDisplayName() + "§7.")); } |