diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/textreader/HelpInput.java | 16 | ||||
| -rw-r--r-- | lib/bukkit-1.0.0-R1-SNAPSHOT.jar | bin | 4390614 -> 4390943 bytes | |||
| -rw-r--r-- | lib/craftbukkit-1.0.0-SNAPSHOT.jar | bin | 9768704 -> 9770067 bytes |
3 files changed, 8 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java index 288058591..85c00c1b6 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java +++ b/Essentials/src/com/earth2me/essentials/textreader/HelpInput.java @@ -67,19 +67,16 @@ public class HelpInput implements IText { permissions = value.get(PERMISSIONS); } - if (permissions instanceof String && !permissions.equals("")) + if (user.isAuthorized("essentials.help." + pluginName)) { - if (user.isAuthorized((String)permissions)) - { - lines.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION)); - } + lines.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION)); } else if (permissions instanceof List && !((List<Object>)permissions).isEmpty()) { boolean enabled = false; for (Object o : (List<Object>)permissions) { - if (o instanceof String && user.isAuthorized((String)o)) + if (o instanceof String && user.isAuthorized(o.toString())) { enabled = true; break; @@ -90,9 +87,12 @@ public class HelpInput implements IText lines.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION)); } } - else if (user.isAuthorized("essentials.help." + pluginName)) + else if (permissions instanceof String && !"".equals(permissions)) { - lines.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION)); + if (user.isAuthorized(permissions.toString())) + { + lines.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION)); + } } else { diff --git a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar b/lib/bukkit-1.0.0-R1-SNAPSHOT.jar Binary files differindex ba9113a30..94831e77b 100644 --- a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar +++ b/lib/bukkit-1.0.0-R1-SNAPSHOT.jar diff --git a/lib/craftbukkit-1.0.0-SNAPSHOT.jar b/lib/craftbukkit-1.0.0-SNAPSHOT.jar Binary files differindex 1bf2aaafa..208cc9bb3 100644 --- a/lib/craftbukkit-1.0.0-SNAPSHOT.jar +++ b/lib/craftbukkit-1.0.0-SNAPSHOT.jar |