Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 01:27:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'remotes/origin/groupmanager'

Browse Source
This commit is contained in:
KHobbits 2012-01-19 15:31:47 +00:00
commit e015cad131
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/nbproject/project.properties
View File

@ -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}:\

3
EssentialsGroupManager/src/Changelog.txt
View File

@ -105,4 +105,5 @@ v 1.8:
v 1.9: 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.

2
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View File

@ -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)

1
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
View File

@ -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);
} }