diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-19 15:31:47 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-19 15:34:00 +0000 |
| commit | e015cad131dc5167ce56d5dc3689f0d78e7aef85 (patch) | |
| tree | e62834952206acf124d4b7ff3adef27f18c54bcf | |
| parent | 008f0d595f67c14004eba1d8715eca39598eece3 (diff) | |
| parent | 7ee391917536686ed8faad16534754e1b3a4df18 (diff) | |
| download | Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.gz Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.lz Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.xz Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.zip | |
Merge remote branch 'remotes/origin/groupmanager'
4 files changed, 5 insertions, 5 deletions
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index edb3d0929..4e80ceafa 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -71,7 +71,7 @@ file.reference.craftbukkit.jar=../lib/craftbukkit.jar file.reference.iCo4.jar=../lib/iCo4.jar file.reference.iCo5.jar=../lib/iCo5.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.Permissions3.jar=../lib/Permissions3.jar file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar @@ -91,7 +91,7 @@ javac.classpath=\ ${file.reference.PermissionsEx.jar}:\ ${file.reference.bPermissions.jar}:\ ${file.reference.PermissionsBukkit-1.2.jar}:\ - ${file.reference.lombok-0.10.8.jar}:\ + ${file.reference.lombok.jar}:\ ${reference.EssentialsGroupManager.jar}:\ ${file.reference.bukkit.jar}:\ ${file.reference.craftbukkit.jar}:\ diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index d278aa127..470ccc911 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -105,4 +105,5 @@ v 1.8: v 1.9:
- 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.
- - Better optimize assembling of a players permissions and allow the * node to populate all registered superperms.
\ No newline at end of file + - 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.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 8134a1c23..76b9e46b2 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -493,7 +493,7 @@ public class GroupManager extends JavaPlugin { } // PARECE OK 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()); if (targetPlayer != null) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index 183236cd8..e060daf85 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -230,7 +230,6 @@ public class BukkitPermissions { attachment.setPermission(permission, value);
}
*/
- System.out.print("Permission: " + permission);
newPerms.put((value? permission : permission.substring(1)), value);
}
|