summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-19 15:31:47 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-19 15:34:00 +0000
commite015cad131dc5167ce56d5dc3689f0d78e7aef85 (patch)
treee62834952206acf124d4b7ff3adef27f18c54bcf /EssentialsGroupManager/src
parent008f0d595f67c14004eba1d8715eca39598eece3 (diff)
parent7ee391917536686ed8faad16534754e1b3a4df18 (diff)
downloadEssentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar
Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.gz
Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.lz
Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.tar.xz
Essentials-e015cad131dc5167ce56d5dc3689f0d78e7aef85.zip
Merge remote branch 'remotes/origin/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java2
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java1
3 files changed, 3 insertions, 3 deletions
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);
}