Fixed manudelsub not correctly selecting the group to remove.

2 files changed, 8 insertions, 1 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index b8034e19c..37f1e5213 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -35,4 +35,5 @@ v 1.2:
 	- Added event handling to manage new world creation at runtime.

 	- Added the ability to handle unknown worlds at server start.

 	  (GM will create the data files for any worlds it finds which are not in the config.yml)

-	- Fix for Bukkit passing a null To location on a player Portaling
\ No newline at end of file
+	- Fix for Bukkit passing a null To location on a player Portaling

+	- Fixed manudelsub not correctly selecting the group to remove.
\ 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 0fe8a15d4..34534aa5f 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -478,6 +478,12 @@ public class GroupManager extends JavaPlugin {
                     } else {
                         auxUser = dataHolder.getUser(args[0]);
                     }
+                    auxGroup = dataHolder.getGroup(args[1]);
+                    if (auxGroup == null) {
+                        sender.sendMessage(ChatColor.RED + "Group not found!");
+                        return false;
+                    }
+                    
                     //VALIDANDO PERMISSAO
                     if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getName(), senderGroup.getName()) : false)) {
                         sender.sendMessage(ChatColor.RED + "Can't modify player with same permissions than you, or higher.");