Skip to content

Commit

Permalink
Executor Update
Browse files Browse the repository at this point in the history
Updating Executor in preparation for the converting command.

Also, updating sender instanceof Player methods.
  • Loading branch information
FerusGrim committed May 3, 2014
1 parent e28b76e commit 3d221f6
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/main/java/io/github/ferusgrim/GrimList/Executor.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
case "set":
SetConfig sc = new SetConfig(plugin);
return sc.run(sender, args);
case "export":
ConvertRecords exp = new ConvertRecords(plugin);
return exp.run(sender, args);
case "import":
ConvertRecords imp = new ConvertRecords(plugin);
return imp.run(sender, args);
default:
if (sender instanceof Player) {
sender.sendMessage(plugin.mStart + "Unknown or invalid command!");
} else {
plugin.log("WARNING", "Unknown or invalid command!");
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Unknown or invalid command!");
return true;
}
}
Expand All @@ -79,6 +81,10 @@ private boolean containsError(CommandSender sender, String[] args) {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Not enough arguments to use this command!");
return true;
}
if ((function.equals("export") || function.equals("import")) && args.length < 2) {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Not enough arguments to use this command!");
return true;
}
return false;
}

Expand All @@ -105,6 +111,12 @@ private String inferAlias(String function) {
case "-g":
function = "getid";
break;
case "-e":
function = "export";
break;
case "-i":
function = "import";
break;
}
return function;
}
Expand Down

0 comments on commit 3d221f6

Please sign in to comment.