Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-04 07:28:04 +01:00
Code Issues Projects Releases Wiki Activity

Force displayname update on /list.

Browse Source 
Tidy duplicate displayname call.
This commit is contained in:
KHobbits 2011-11-04 16:51:00 +00:00
parent fd2ec22919
commit 05242a7e8f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -47,7 +47,6 @@ 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.setDisplayNick(user.getNick());
updateCompass(user); updateCompass(user);
if (ess.getSettings().changeDisplayName()) if (ess.getSettings().changeDisplayName())
{ {

5
Essentials/src/com/earth2me/essentials/User.java
View File

@ -258,7 +258,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
if (ess.getSettings().addPrefixSuffix()) if (ess.getSettings().addPrefixSuffix())
{ {
if (!ess.getSettings().disablePrefix()) if (!ess.getSettings().disablePrefix())
{ {
final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName()); final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
@ -291,6 +290,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
@Override @Override
public String getDisplayName() public String getDisplayName()
{ {
if (ess.getSettings().changeDisplayName())
{
setDisplayNick(getNick());
}
return super.getDisplayName() == null ? super.getName() : super.getDisplayName(); return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
} }