TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Adding list name to /nick support.

Browse source
This commit is contained in:
KHobbits 2011-10-04 07:21:09 +01:00
parent 0aa9f79629
commit da337284e5
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -46,11 +46,11 @@ public class EssentialsPlayerListener extends PlayerListener
public void onPlayerRespawn(final PlayerRespawnEvent event) public void onPlayerRespawn(final PlayerRespawnEvent event)
{ {
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
user.setDisplayName(user.getNick()); user.setDisplayNick(user.getNick());
updateCompass(user); updateCompass(user);
if (ess.getSettings().changeDisplayName()) if (ess.getSettings().changeDisplayName())
{ {
user.setDisplayName(user.getNick()); user.setDisplayNick(user.getNick());
} }
} }
@ -76,7 +76,7 @@ public class EssentialsPlayerListener extends PlayerListener
user.updateActivity(true); user.updateActivity(true);
if (ess.getSettings().changeDisplayName()) 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()) if (ess.getSettings().changeDisplayName())
{ {
user.setDisplayName(user.getNick()); user.setDisplayNick(user.getNick());
} }
user.updateActivity(false); user.updateActivity(false);
if (user.isAuthorized("essentials.sleepingignored")) if (user.isAuthorized("essentials.sleepingignored"))
@ -351,7 +351,7 @@ public class EssentialsPlayerListener extends PlayerListener
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
if (ess.getSettings().changeDisplayName()) if (ess.getSettings().changeDisplayName())
{ {
user.setDisplayName(user.getNick()); user.setDisplayNick(user.getNick());
} }
updateCompass(user); updateCompass(user);
} }

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

@ -282,6 +282,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
return nickname.toString(); return nickname.toString();
} }
public void setDisplayNick(String name)
{
setDisplayName(name);
setPlayerListName(name);
}
public Teleport getTeleport() public Teleport getTeleport()
{ {

8
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View file

@ -41,7 +41,7 @@ public class Commandnick extends EssentialsCommand
String nick = args[0]; String nick = args[0];
if ("off".equalsIgnoreCase(nick) || user.getName().equalsIgnoreCase(nick)) if ("off".equalsIgnoreCase(nick) || user.getName().equalsIgnoreCase(nick))
{ {
user.setDisplayName(user.getName()); user.setDisplayNick(user.getName());
user.setNickname(null); user.setNickname(null);
user.sendMessage(Util.i18n("nickNoMore")); user.sendMessage(Util.i18n("nickNoMore"));
return; 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.setNickname(nick);
user.sendMessage(Util.format("nickSet", user.getDisplayName() + "§7.")); user.sendMessage(Util.format("nickSet", user.getDisplayName() + "§7."));
} }
@ -95,13 +95,13 @@ public class Commandnick extends EssentialsCommand
String nick = args[1]; String nick = args[1];
if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick)) if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick))
{ {
target.setDisplayName(target.getName()); target.setDisplayNick(target.getName());
target.setNickname(null); target.setNickname(null);
target.sendMessage(Util.i18n("nickNoMore")); target.sendMessage(Util.i18n("nickNoMore"));
} }
else else
{ {
target.setDisplayName(ess.getSettings().getNicknamePrefix() + nick); target.setDisplayNick(ess.getSettings().getNicknamePrefix() + nick);
target.setNickname(nick); target.setNickname(nick);
target.sendMessage(Util.format("nickSet", target.getDisplayName() + "§7.")); target.sendMessage(Util.format("nickSet", target.getDisplayName() + "§7."));
} }