TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-09-12 05:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #362 from necrodoom/patch-67

Browse source 
fix a few groupmanager.java errors
This commit is contained in:
ElgarL 2013-02-26 06:43:31 -08:00
parent c1b4ed5920 308f05b8bf
commit 17dab04094
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View file

@ -393,7 +393,8 @@ public class GroupManager extends JavaPlugin {
// PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS // PREVENT GM COMMANDS BEING USED ON COMMANDBLOCKS
if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) { if (sender instanceof BlockCommandSender && !isAllowCommandBlocks) {
Block block = ((BlockCommandSender)sender).getBlock(); 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; return true;
} }
@ -674,7 +675,7 @@ public class GroupManager extends JavaPlugin {
} }
auxGroup = dataHolder.getGroup(args[0]); auxGroup = dataHolder.getGroup(args[0]);
if (auxGroup != null) { if (auxGroup != null) {
sender.sendMessage(ChatColor.RED + "" + args[0] + " Group doesnt exist!"); sender.sendMessage(ChatColor.RED + "" + args[0] + " Group already exist!");
return true; return true;
} }
// Seems OK // Seems OK
@ -770,8 +771,10 @@ public class GroupManager extends JavaPlugin {
} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.FOUND)) { } 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 + "The user already has direct access to that permission.");
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
if (permissionResult.accessLevel.equalsIgnoreCase(args[1])); if (permissionResult.accessLevel.equalsIgnoreCase(args[1]))
{
return true; return true;
}
} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) { } else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
// Warn only while still allowing you to add the node. // Warn only while still allowing you to add the node.
sender.sendMessage(ChatColor.RED + "The user already has a matching Negated 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 + "The group already has direct access to that permission.");
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
// Abort adding if the node is a direct match. // Abort adding if the node is a direct match.
if (permissionResult.accessLevel.equalsIgnoreCase(args[1])); if (permissionResult.accessLevel.equalsIgnoreCase(args[1]))
{
return true; return true;
}
} else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) { } else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
// Warn only while still allowing you to add the node. // Warn only while still allowing you to add the node.
sender.sendMessage(ChatColor.RED + "The group already has a matching Negated node."); sender.sendMessage(ChatColor.RED + "The group already has a matching Negated node.");