Merge pull request #1026 from manuelgu/feature/fixes

Fixes and cleanup

Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java

@@ -33,12 +33,12 @@ public class Debug extends SubCommand {
         PS.get().foreachPlotArea(new RunnableVal<PlotArea>() {
             @Override
             public void run(PlotArea value) {
-                worlds.append(value.toString()).append(" ");
+                worlds.append(value.toString()).append(", ");
             }
         });
         information.append(header);
         information.append(getSection(section, "PlotArea"));
-        information.append(getLine(line, "Plot Worlds", worlds));
+        information.append(getLine(line, "Plot Worlds", worlds.substring(0, worlds.length() - 2)));
         information.append(getLine(line, "Owned Plots", PS.get().getPlots().size()));
         information.append(getSection(section, "Messages"));
         information.append(getLine(line, "Total Messages", C.values().length));

Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java

@@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.object.PlotAnalysis;
 import com.intellectualcrafters.plot.object.PlotArea;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotMessage;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.object.RunnableVal2;
@@ -43,6 +44,7 @@ import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 import javax.script.Bindings;
 import javax.script.ScriptContext;
@@ -57,7 +59,6 @@ import javax.script.SimpleScriptContext;
         aliases = {"exec", "$"},
         category = CommandCategory.DEBUG)
 public class DebugExec extends SubCommand {
-
     private ScriptEngine engine;
     private Bindings scope;
 
@@ -145,7 +146,7 @@ public class DebugExec extends SubCommand {
     @Override
     public boolean onCommand(final PlotPlayer player, String[] args) {
         java.util.List<String> allowed_params =
-                Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "show-expired", "update-expired", "seen");
+                Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "list-scripts");
         if (args.length > 0) {
             String arg = args[0].toLowerCase();
             String script;
@@ -329,6 +330,42 @@ public class DebugExec extends SubCommand {
                         return false;
                     }
                     break;
+                case "list-scripts":
+                    final String path = PS.get().IMP.getDirectory() + File.separator + "scripts";
+                    File folder = new File(path);
+                    File[] filesArray = folder.listFiles();
+
+                    int page;
+                    switch (args.length) {
+                        case 1:
+                            page = 0;
+                            break;
+                        case 2:
+                            if (MathMan.isInteger(args[1])) {
+                                page = Integer.parseInt(args[1]) - 1;
+                                break;
+                            }
+                        default:
+                            C.COMMAND_SYNTAX.send(player, "/plot debugexec list-scripts [#]");
+                            return false;
+                    }
+
+                    List<File> allFiles = Arrays.asList(filesArray);
+                    paginate(player, allFiles, 8, page, new RunnableVal3<Integer, File, PlotMessage>() {
+
+                        @Override
+                        public void run(Integer i, File file, PlotMessage message) {
+                            String name;
+                            name = file.getName();
+
+                            message.text("[").color("$3")
+                                    .text(i + "").color("$1")
+                                    .text("]").color("$3")
+                                    .text(" " + name).color("$1");
+
+                        }
+                    }, "/plot debugexec list-scripts", "List of scripts");
+                    return true;
                 case "allcmd":
                     if (args.length < 3) {
                         C.COMMAND_SYNTAX.send(player, "/plot debugexec allcmd <condition> <command>");

Core/src/main/java/com/intellectualcrafters/plot/commands/Grant.java

@@ -9,7 +9,6 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
-
 import java.util.UUID;
 
 @CommandDeclaration(

Core/src/main/java/com/intellectualcrafters/plot/commands/Target.java

@@ -7,6 +7,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
+import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
@@ -18,6 +19,10 @@ import com.plotsquared.general.commands.CommandDeclaration;
         category = CommandCategory.INFO)
 public class Target extends SubCommand {
 
+    public Target() {
+        super(Argument.PlotID);
+    }
+
     @Override
     public boolean onCommand(PlotPlayer plr, String[] args) {
         Location plrLocation = plr.getLocation();