mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-01 20:30:48 +02:00
Ensure GM reports the same permissions as Bukkit.
This commit is contained in:
@@ -2219,7 +2219,7 @@ public class GroupManager extends JavaPlugin {
|
||||
|
||||
} else {
|
||||
for (Player player : players) {
|
||||
match.add(player.getName()); //.getUniqueId().toString());
|
||||
match.add(player.getUniqueId().toString());
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -130,7 +130,7 @@ public class WorldDataHolder {
|
||||
|
||||
User user = getUsers().get(uid);
|
||||
|
||||
if (user.getLastName().equalsIgnoreCase(userId)) {
|
||||
if ((user != null) && user.getLastName().equalsIgnoreCase(userId)) {
|
||||
return user;
|
||||
}
|
||||
}
|
||||
@@ -156,7 +156,8 @@ public class WorldDataHolder {
|
||||
User user = getUsers().get(uUID.toLowerCase());
|
||||
|
||||
if (user != null) {
|
||||
|
||||
System.out.println("Matched: " + uUID);
|
||||
System.out.println("In World: " + this.getName());
|
||||
user.setLastName(currentName);
|
||||
return user;
|
||||
|
||||
@@ -177,6 +178,9 @@ public class WorldDataHolder {
|
||||
return getUsers().get(uUID.toLowerCase());
|
||||
}
|
||||
|
||||
System.out.println("New user: " + uUID);
|
||||
System.out.println("In World: " + this.getName());
|
||||
|
||||
// No user account found so create a new one.
|
||||
User newUser = createUser(uUID);
|
||||
newUser.setLastName(currentName);
|
||||
|
@@ -150,7 +150,7 @@ public class BukkitPermissions {
|
||||
String uuid = player.getUniqueId().toString();
|
||||
|
||||
// Reset the User objects player reference.
|
||||
User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getUniqueId().toString(), player.getName());
|
||||
User user = plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(uuid, player.getName());
|
||||
|
||||
if (user != null)
|
||||
user.updatePlayer(player);
|
||||
|
Reference in New Issue
Block a user