mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-12-23 09:37:50 +01:00
Merge remote branch 'remotes/origin/groupmanager'
This commit is contained in:
commit
e015cad131
@ -71,7 +71,7 @@ file.reference.craftbukkit.jar=../lib/craftbukkit.jar
|
|||||||
file.reference.iCo4.jar=../lib/iCo4.jar
|
file.reference.iCo4.jar=../lib/iCo4.jar
|
||||||
file.reference.iCo5.jar=../lib/iCo5.jar
|
file.reference.iCo5.jar=../lib/iCo5.jar
|
||||||
file.reference.iCo6.jar=../lib/iCo6.jar
|
file.reference.iCo6.jar=../lib/iCo6.jar
|
||||||
file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.8.jar
|
file.reference.lombok.jar=../lib/lombok-0.10.8.jar
|
||||||
file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
|
file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
|
||||||
file.reference.Permissions3.jar=../lib/Permissions3.jar
|
file.reference.Permissions3.jar=../lib/Permissions3.jar
|
||||||
file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
|
file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
|
||||||
@ -91,7 +91,7 @@ javac.classpath=\
|
|||||||
${file.reference.PermissionsEx.jar}:\
|
${file.reference.PermissionsEx.jar}:\
|
||||||
${file.reference.bPermissions.jar}:\
|
${file.reference.bPermissions.jar}:\
|
||||||
${file.reference.PermissionsBukkit-1.2.jar}:\
|
${file.reference.PermissionsBukkit-1.2.jar}:\
|
||||||
${file.reference.lombok-0.10.8.jar}:\
|
${file.reference.lombok.jar}:\
|
||||||
${reference.EssentialsGroupManager.jar}:\
|
${reference.EssentialsGroupManager.jar}:\
|
||||||
${file.reference.bukkit.jar}:\
|
${file.reference.bukkit.jar}:\
|
||||||
${file.reference.craftbukkit.jar}:\
|
${file.reference.craftbukkit.jar}:\
|
||||||
|
@ -106,3 +106,4 @@ v 1.9:
|
|||||||
- Optimize populating Bukkit perms so we no longer calculate the child nodes (Bukkit already does this).
|
- Optimize populating Bukkit perms so we no longer calculate the child nodes (Bukkit already does this).
|
||||||
- Added a tidy error message for invalid permission entries in GlobalGroups.
|
- Added a tidy error message for invalid permission entries in GlobalGroups.
|
||||||
- Better optimize assembling of a players permissions and allow the * node to populate all registered superperms.
|
- Better optimize assembling of a players permissions and allow the * node to populate all registered superperms.
|
||||||
|
- Fixed text when adding a subgroup to not say the player was moved.
|
@ -493,7 +493,7 @@ public class GroupManager extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
// PARECE OK
|
// PARECE OK
|
||||||
auxUser.addSubGroup(auxGroup);
|
auxUser.addSubGroup(auxGroup);
|
||||||
sender.sendMessage(ChatColor.YELLOW + "You changed player '" + auxUser.getName() + "' group to '" + auxGroup.getName() + "'.");
|
sender.sendMessage(ChatColor.YELLOW + "You added subgroup '" + auxGroup.getName() + "' to player '" + auxUser.getName() + "'.");
|
||||||
|
|
||||||
targetPlayer = this.getServer().getPlayer(auxUser.getName());
|
targetPlayer = this.getServer().getPlayer(auxUser.getName());
|
||||||
if (targetPlayer != null)
|
if (targetPlayer != null)
|
||||||
|
@ -230,7 +230,6 @@ public class BukkitPermissions {
|
|||||||
attachment.setPermission(permission, value);
|
attachment.setPermission(permission, value);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
System.out.print("Permission: " + permission);
|
|
||||||
newPerms.put((value? permission : permission.substring(1)), value);
|
newPerms.put((value? permission : permission.substring(1)), value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user