minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 12:01:20 +02:00
Code Issues Releases Wiki Activity

Cleanup of KHobbits commit

Browse Source
This commit is contained in:
snowleo
2011-06-25 16:46:02 +02:00
parent 2926ec5ea4
commit 5670bcc713
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
View File

@@ -31,18 +31,18 @@ public class Commandhelp extends EssentialsCommand
protected void run(Server server, User user, String commandLabel, String[] args) throws Exception protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
{ {
int page = 1; int page = 1;
String match = args[0].toLowerCase(); String match = args[0].toLowerCase();
try try
{ {
if (args.length > 0) if (args.length > 0)
{ {
page = Integer.parseInt(args[args.length - 1]); page = Integer.parseInt(args[args.length - 1]);
if (args.length == 1) if (args.length == 1)
{ {
match = ""; match = "";
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -69,10 +69,10 @@ public class Commandhelp extends EssentialsCommand
private List<String> getHelpLines(User user, String match) throws Exception private List<String> getHelpLines(User user, String match) throws Exception
{ {
List<String> retval = new ArrayList<String>(); List<String> retval = new ArrayList<String>();
File helpFile = new File(ess.getDataFolder(), "help_"+Util.sanitizeFileName(user.getName()) +".txt"); File helpFile = new File(ess.getDataFolder(), "help_" + Util.sanitizeFileName(user.getName()) + ".txt");
if (!helpFile.exists()) if (!helpFile.exists())
{ {
helpFile = new File(ess.getDataFolder(), "help_"+Util.sanitizeFileName(user.getGroup()) +".txt"); helpFile = new File(ess.getDataFolder(), "help_" + Util.sanitizeFileName(user.getGroup()) + ".txt");
} }
if (!helpFile.exists()) if (!helpFile.exists())
{ {
@@ -81,8 +81,9 @@ public class Commandhelp extends EssentialsCommand
if (helpFile.exists()) if (helpFile.exists())
{ {
final BufferedReader bufferedReader = new BufferedReader(new FileReader(helpFile)); final BufferedReader bufferedReader = new BufferedReader(new FileReader(helpFile));
try { try
{
while (bufferedReader.ready()) while (bufferedReader.ready())
{ {
final String line = bufferedReader.readLine(); final String line = bufferedReader.readLine();
@@ -107,11 +108,11 @@ public class Commandhelp extends EssentialsCommand
for (Entry<String, HashMap<String, String>> k : cmds.entrySet()) for (Entry<String, HashMap<String, String>> k : cmds.entrySet())
{ {
if ((!match.equalsIgnoreCase("")) && (!p.getDescription().getName().toLowerCase().contains(match)) if ((!match.equalsIgnoreCase("")) && (!p.getDescription().getName().toLowerCase().contains(match))
&& (!p.getDescription().getDescription().toLowerCase().contains(match))) && (!p.getDescription().getDescription().toLowerCase().contains(match)))
{ {
continue; continue;
} }
if (p.getDescription().getName().toLowerCase().contains("essentials")) if (p.getDescription().getName().toLowerCase().contains("essentials"))
{ {
final String node = "essentials." + k.getKey(); final String node = "essentials." + k.getKey();