EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 16:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Minor command fixes

Browse Source
This commit is contained in:
Sauilitired 2015-07-27 21:24:04 +02:00
parent aa735f8073
commit 5a6847a039
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -37,6 +37,7 @@ import com.plotsquared.general.commands.Command;
import com.plotsquared.general.commands.CommandHandlingOutput; import com.plotsquared.general.commands.CommandHandlingOutput;
import com.plotsquared.general.commands.CommandManager; import com.plotsquared.general.commands.CommandManager;
import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
@ -209,7 +210,9 @@ public class MainCommand extends CommandManager<PlotPlayer> {
try { try {
help_index = Integer.parseInt(args[2]); help_index = Integer.parseInt(args[2]);
} }
catch (NumberFormatException e) {} catch (NumberFormatException e) {
help_index = 1;
}
} }
break; break;
} }
@ -218,10 +221,11 @@ public class MainCommand extends CommandManager<PlotPlayer> {
category = null; category = null;
try { try {
help_index = Integer.parseInt(args[1]); help_index = Integer.parseInt(args[1]);
} catch(NumberFormatException e) {
help_index = 1;
} }
catch (NumberFormatException e) {} } else {
} help_index = 1;
if (category == null) {
category = args[1]; category = args[1];
} }
break; break;
@ -294,12 +298,12 @@ public class MainCommand extends CommandManager<PlotPlayer> {
MainUtil.sendMessage(plr, C.NOT_VALID_SUBCOMMAND); MainUtil.sendMessage(plr, C.NOT_VALID_SUBCOMMAND);
{ {
ArrayList<Command<PlotPlayer>> cmds = getCommands(); ArrayList<Command<PlotPlayer>> cmds = getCommands();
cmd = new StringComparison<Command<PlotPlayer>>(label, cmds).getMatchObject(); cmd = new StringComparison<>(label, cmds).getMatchObject();
if (cmd == null) { if (cmd == null) {
MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help"); MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help");
} }
else { else {
MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("{label}", label)); MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("\\{label\\}", label));
} }
} }
return CommandHandlingOutput.NOT_FOUND; return CommandHandlingOutput.NOT_FOUND;