EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Add world argument

Browse Source
This commit is contained in:
Jesse Boyd 2016-11-23 15:47:18 +11:00
parent fb729df59e
commit 9fd53af483
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View File

@ -4,6 +4,7 @@ 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.Plot; import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RunnableVal2; import com.intellectualcrafters.plot.object.RunnableVal2;
import com.intellectualcrafters.plot.object.RunnableVal3; import com.intellectualcrafters.plot.object.RunnableVal3;
@ -46,16 +47,36 @@ public class Visit extends Command {
} }
int page = Integer.MIN_VALUE; int page = Integer.MIN_VALUE;
Collection<Plot> unsorted = null; Collection<Plot> unsorted = null;
PlotArea sortByArea = player.getApplicablePlotArea();
boolean shouldSortByArea = Settings.Teleport.PER_WORLD_VISIT;
switch (args.length) { switch (args.length) {
case 2: case 3:
if (!MathMan.isInteger(args[1])) { if (!MathMan.isInteger(args[1])) {
C.NOT_VALID_NUMBER.send(player, "(1, ∞)"); C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
C.COMMAND_SYNTAX.send(player, getUsage()); C.COMMAND_SYNTAX.send(player, getUsage());
return; return;
} }
page = Integer.parseInt(args[2]);
case 2:
if (!MathMan.isInteger(args[1])) {
sortByArea = PS.get().getPlotAreaByString(args[1]);
if (sortByArea == null) {
C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
C.COMMAND_SYNTAX.send(player, getUsage());
return;
}
UUID user = UUIDHandler.getUUIDFromString(args[0]);
if (user == null) {
C.COMMAND_SYNTAX.send(player, getUsage());
return;
}
unsorted = PS.get().getBasePlots(user);
shouldSortByArea = true;
break;
}
page = Integer.parseInt(args[1]); page = Integer.parseInt(args[1]);
case 1: case 1:
UUID user = (args.length == 2 || !MathMan.isInteger(args[0])) ? UUIDHandler.getCachedUUID(args[0], null) : null; UUID user = (args.length == 2 || !MathMan.isInteger(args[0])) ? UUIDHandler.getUUIDFromString(args[0]) : null;
if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) { if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
page = Integer.parseInt(args[0]); page = Integer.parseInt(args[0]);
unsorted = PS.get().getBasePlots(player); unsorted = PS.get().getBasePlots(player);
@ -95,8 +116,8 @@ public class Visit extends Command {
return; return;
} }
List<Plot> plots; List<Plot> plots;
if (Settings.Teleport.PER_WORLD_VISIT) { if (shouldSortByArea) {
plots = PS.get().sortPlots(unsorted, PS.SortType.CREATION_DATE, player.getApplicablePlotArea()); plots = PS.get().sortPlots(unsorted, PS.SortType.CREATION_DATE, sortByArea);
} else { } else {
plots = PS.get().sortPlotsByTemp(unsorted); plots = PS.get().sortPlotsByTemp(unsorted);
} }