From 49aef0d7d9a831b595d864d84b480cd5060de74d Mon Sep 17 00:00:00 2001 From: mung3r Date: Tue, 7 Aug 2012 12:14:07 -0700 Subject: [PATCH 1/2] fixed potential infinite loops --- src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java b/src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java index b143560..a3f6bd1 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java @@ -220,7 +220,7 @@ public class Chat_Permissions3 extends Chat { @Override public String getGroupPrefix(String world, String group) { - return this.getGroupPrefix(world, group); + return this.perms.getGroupPrefix(world, group); } @Override @@ -230,7 +230,7 @@ public class Chat_Permissions3 extends Chat { @Override public String getGroupSuffix(String world, String group) { - return this.getGroupSuffix(world, group); + return this.perms.getGroupSuffix(world, group); } @Override From 69944e01a36271608e3b56422d2b277b71b6316e Mon Sep 17 00:00:00 2001 From: mung3r Date: Tue, 7 Aug 2012 12:14:56 -0700 Subject: [PATCH 2/2] fixed some ambiguity with local vars --- .../vault/permission/plugins/Permission_PermissionsBukkit.java | 2 +- .../vault/permission/plugins/Permission_SimplyPerms.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java index bb8acec..2bfbc39 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java @@ -45,7 +45,7 @@ public class Permission_PermissionsBukkit extends Permission { if (perms == null) { Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsBukkit"); if (perms != null) { - perms = (PermissionsPlugin) perms; + this.perms = (PermissionsPlugin) perms; log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java index a3b5614..6464583 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java @@ -148,8 +148,8 @@ public class Permission_SimplyPerms extends Permission{ public boolean groupRemove(String world, String group, String permission) { permission = permission.toLowerCase(); if (world != null) { - this.perms.removeGroupPermission(group, world, permission); permission = world + ":" + permission; + this.perms.removeGroupPermission(group, world, permission); } else { this.perms.removeGroupPermission(group, permission); }