1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-07 23:27:08 +02:00

Merge branch 'essmaster' into essrelease

This commit is contained in:
KHobbits
2011-10-04 14:40:12 +01:00
2 changed files with 5 additions and 2 deletions

View File

@@ -256,7 +256,7 @@ public class Teleport implements Runnable
public void back() throws Exception
{
back(null);
now(new Target(user.getLastLocation()));
}
public void home(IUser user, String home, Trade chargeFor) throws Exception

View File

@@ -286,7 +286,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
public void setDisplayNick(String name)
{
setDisplayName(name);
setPlayerListName(name);
//TODO: Maybe we need to limit nick length, or try use a string trim.
if (name.length() <= 16) {
setPlayerListName(name);
}
}
public Teleport getTeleport()