diff options
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java | 6 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java index 36c26bb1d..90fd28e8d 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java @@ -100,14 +100,14 @@ public abstract class DataUnit { public String getLastName() { if (uUID.length() < 36) - return uUID; + return this.uUID; - return lastName; + return this.lastName; } public void setLastName(String lastName) { - if (!this.lastName.equals(lastName)) { + if (!lastName.equals(this.lastName)) { this.lastName = lastName; changed = true; diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index e6d11274f..38663ba7d 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -69,10 +69,10 @@ public class User extends DataUnit implements Cloneable { */ public User clone(WorldDataHolder dataSource) { - if (dataSource.isUserDeclared(this.getLastName())) { + if (dataSource.isUserDeclared(this.getUUID())) { return null; } - User clone = dataSource.createUser(this.getLastName()); + User clone = dataSource.createUser(this.getUUID()); if (dataSource.getGroup(group) == null) { clone.setGroup(dataSource.getDefaultGroup()); } else { @@ -86,17 +86,14 @@ public class User extends DataUnit implements Cloneable { return clone; } - public User clone(String uUID) { + public User clone(String uUID, String CurrentName) { User clone = this.getDataSource().createUser(uUID); - if (this.getDataSource().getGroup(group) == null) { - clone.setGroup(this.getDataSource().getDefaultGroup()); - } else { - clone.setGroup(this.getDataSource().getGroup(this.getGroupName())); - } + clone.setLastName(CurrentName); - clone.setLastName(this.getLastName()); + // Set the group silently. + clone.setGroup(this.getDataSource().getGroup(this.getGroupName()), false); for (String perm : this.getPermissionList()) { clone.addPermission(perm); @@ -181,7 +178,8 @@ public class User extends DataUnit implements Cloneable { if (notify) GroupManager.notify(this.getLastName(), String.format(" moved to the group %s in %s.", group.getName(), this.getDataSource().getName())); - GroupManager.getGMEventHandler().callEvent(this, Action.USER_GROUP_CHANGED); + if (updatePerms) + GroupManager.getGMEventHandler().callEvent(this, Action.USER_GROUP_CHANGED); } } |