Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor stuff

Browse Source
This commit is contained in:
boy0001 2015-07-28 03:47:27 +10:00
parent 955fa674d0
commit e50605d69a
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,8 @@ import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.ConsolePlayer; import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.MathMan; import com.intellectualcrafters.plot.util.MathMan;
@ -192,7 +194,7 @@ public class MainCommand extends CommandManager<PlotPlayer> {
.render(); .render();
} }
public static boolean onCommand(final PlotPlayer player, final String cmd, final String... args) { public static boolean onCommand(final PlotPlayer player, final String cmd, String... args) {
int help_index = -1; int help_index = -1;
String category = null; String category = null;
if (args.length == 0) { if (args.length == 0) {
@ -232,6 +234,34 @@ public class MainCommand extends CommandManager<PlotPlayer> {
} }
catch (NumberFormatException e) {} catch (NumberFormatException e) {}
} }
else if (ConsolePlayer.isConsole(player) && args.length >= 2) {
System.out.print(1);
String[] split = args[0].split(";");
String world;
PlotId id;
if (split.length == 2) {
world = player.getLocation().getWorld();
id = PlotId.fromString(split[0] + ";" + split[1]);
}
else if (split.length == 3) {
world = split[0];
id = PlotId.fromString(split[1] + ";" + split[2]);
}
else {
id = null;
world = null;
}
if (id != null && PS.get().isPlotWorld(world)) {
System.out.print(2 + " | " + id + " | " + world);
Plot plot = MainUtil.getPlot(world, id);
if (plot != null) {
System.out.print(3 + " | " + plot);
player.teleport(MainUtil.getPlotCenter(plot));
args = Arrays.copyOfRange(args, 1, args.length);
}
}
}
if (help_index != -1) { if (help_index != -1) {
displayHelp(player, category, help_index, cmd); displayHelp(player, category, help_index, cmd);
return true; return true;
@ -268,7 +298,7 @@ public class MainCommand extends CommandManager<PlotPlayer> {
{ {
ArrayList<Command<PlotPlayer>> cmds = getCommands(); ArrayList<Command<PlotPlayer>> cmds = getCommands();
cmd = new StringComparison<Command<PlotPlayer>>(label, cmds).getMatchObject(); cmd = new StringComparison<Command<PlotPlayer>>(label, cmds).getMatchObject();
MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage()); MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("{label}", label));
} }
return CommandHandlingOutput.NOT_FOUND; return CommandHandlingOutput.NOT_FOUND;
} }

1
src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
View File

@ -48,6 +48,7 @@ public class ConsolePlayer implements PlotPlayer {
@Override @Override
public Location getLocation() { public Location getLocation() {
System.out.print(loc);
return loc; return loc;
} }