Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-16 23:55:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix for showing plugins when user has no permission.

Browse Source
This commit is contained in:
KHobbits 2012-03-23 18:26:19 +00:00
parent 77c6a3b730
commit b3de0aabae
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/textreader/HelpInput.java
View File

@ -36,6 +36,7 @@ public class HelpInput implements IText
{
try
{
final List<String> pluginLines = new ArrayList<String>();
final PluginDescriptionFile desc = p.getDescription();
final Map<String, Map<String, Object>> cmds = desc.getCommands();
pluginName = p.getDescription().getName();
@ -63,7 +64,7 @@ public class HelpInput implements IText
final String node = "essentials." + k.getKey();
if (!ess.getSettings().isCommandDisabled(k.getKey()) && user.isAuthorized(node))
{
newLines.add(_("helpLine", k.getKey(), k.getValue().get(DESCRIPTION)));
pluginLines.add(_("helpLine", k.getKey(), k.getValue().get(DESCRIPTION)));
}
}
else
@ -82,7 +83,7 @@ public class HelpInput implements IText
}
if (user.isAuthorized("essentials.help." + pluginNameLow))
{
newLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
pluginLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
}
else if (permissions instanceof List && !((List<Object>)permissions).isEmpty())
{
@ -97,21 +98,21 @@ public class HelpInput implements IText
}
if (enabled)
{
newLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
pluginLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
}
}
else if (permissions instanceof String && !"".equals(permissions))
{
if (user.isAuthorized(permissions.toString()))
{
newLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
pluginLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
}
}
else
{
if (!ess.getSettings().hidePermissionlessHelp())
{
newLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
pluginLines.add(_("helpLine", k.getKey(), value.get(DESCRIPTION)));
}
}
}
@ -122,8 +123,9 @@ public class HelpInput implements IText
continue;
}
}
if (!newLines.isEmpty())
if (!pluginLines.isEmpty())
{
newLines.addAll(pluginLines);
if (pluginNameLow.equals(match))
{
break;