mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 20:12:54 +00:00
Fixed an infinite loop error when using '/manudel' on a logged in
player. It caused setDefaultGroup to trigger a bukkit update when no GM User existed yet.
This commit is contained in:
parent
3708f2b3bb
commit
746eb353a2
3 changed files with 13 additions and 3 deletions
|
@ -122,3 +122,4 @@ v 1.9:
|
||||||
- Fixed subgroups (I broke earlier).
|
- Fixed subgroups (I broke earlier).
|
||||||
- Check for a null player object in the PlayerTeleportEvent.
|
- Check for a null player object in the PlayerTeleportEvent.
|
||||||
- Trap errors in fetching the mirrors map.
|
- Trap errors in fetching the mirrors map.
|
||||||
|
- Fixed an infinite loop error when using '/manudel' on a logged in player. It caused setDefaultGroup to trigger a bukkit update when no GM User existed yet.
|
|
@ -122,6 +122,15 @@ public class User extends DataUnit implements Cloneable {
|
||||||
* the group to set
|
* the group to set
|
||||||
*/
|
*/
|
||||||
public void setGroup(Group group) {
|
public void setGroup(Group group) {
|
||||||
|
setGroup(group, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param group the group to set
|
||||||
|
* @param updatePerms if we are to trigger a superperms update.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public void setGroup(Group group, Boolean updatePerms) {
|
||||||
if (!this.getDataSource().groupExists(group.getName())) {
|
if (!this.getDataSource().groupExists(group.getName())) {
|
||||||
getDataSource().addGroup(group);
|
getDataSource().addGroup(group);
|
||||||
}
|
}
|
||||||
|
@ -129,7 +138,7 @@ public class User extends DataUnit implements Cloneable {
|
||||||
String oldGroup = this.group;
|
String oldGroup = this.group;
|
||||||
this.group = group.getName();
|
this.group = group.getName();
|
||||||
flagAsChanged();
|
flagAsChanged();
|
||||||
if (GroupManager.isLoaded()) {
|
if (GroupManager.isLoaded() && (updatePerms)) {
|
||||||
if (!GroupManager.BukkitPermissions.isPlayer_join())
|
if (!GroupManager.BukkitPermissions.isPlayer_join())
|
||||||
GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
|
GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer());
|
||||||
|
|
||||||
|
|
|
@ -245,7 +245,7 @@ public class WorldDataHolder {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
User newUser = new User(this, userName);
|
User newUser = new User(this, userName);
|
||||||
newUser.setGroup(groups.getDefaultGroup());
|
newUser.setGroup(groups.getDefaultGroup(), false);
|
||||||
addUser(newUser);
|
addUser(newUser);
|
||||||
setUsersChanged(true);
|
setUsersChanged(true);
|
||||||
return newUser;
|
return newUser;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue