Merge pull request #362 from necrodoom/patch-67

fix a few groupmanager.java errors

1 files changed, 9 insertions, 4 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index ac1fadb54..6e75b3a8a 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -393,7 +393,8 @@ public class GroupManager extends JavaPlugin {
 		// PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS
 		if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) {
 			Block block = ((BlockCommandSender)sender).getBlock();
-			GroupManager.logger.warning(ChatColor.RED + "GM Commands can not be called from the CommandBlock at location: " + ChatColor.GREEN + block.getWorld().getName() + " - " + block.getX() + ", " + block.getY() + ", " + block.getZ());
+			GroupManager.logger.warning(ChatColor.RED + "GM Commands can not be called from CommandBlocks");
+			GroupManager.logger.warning(ChatColor.RED + "Location: " + ChatColor.GREEN + block.getWorld().getName() + ", " + block.getX() + ", " + block.getY() + ", " + block.getZ());
 		  	return true;
 		}
 
@@ -674,7 +675,7 @@ public class GroupManager extends JavaPlugin {
 				}
 				auxGroup = dataHolder.getGroup(args[0]);
 				if (auxGroup != null) {
-					sender.sendMessage(ChatColor.RED + "" + args[0] + " Group doesnt exist!");
+					sender.sendMessage(ChatColor.RED + "" + args[0] + " Group already exist!");
 					return true;
 				}
 				// Seems OK
@@ -770,8 +771,10 @@ public class GroupManager extends JavaPlugin {
 					} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.FOUND)) {
 						sender.sendMessage(ChatColor.RED + "The user already has direct access to that permission.");
 						sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
-						if (permissionResult.accessLevel.equalsIgnoreCase(args[1]));
+						if (permissionResult.accessLevel.equalsIgnoreCase(args[1]))
+						{
 							return true;
+						}
 					} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
 						// Warn only while still allowing you to add the node.
 						sender.sendMessage(ChatColor.RED + "The user already has a matching Negated node.");
@@ -1028,8 +1031,10 @@ public class GroupManager extends JavaPlugin {
 						sender.sendMessage(ChatColor.RED + "The group already has direct access to that permission.");
 						sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
 						// Abort adding if the node is a direct match.
-						if (permissionResult.accessLevel.equalsIgnoreCase(args[1]));
+						if (permissionResult.accessLevel.equalsIgnoreCase(args[1]))
+						{
 							return true;
+						}
 					} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
 						// Warn only while still allowing you to add the node.
 						sender.sendMessage(ChatColor.RED + "The group already has a matching Negated node.");