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

fix: numeric Playernames thows NumberFormatException on Teleport (#1778)

Browse Source 
* fix: numeric Playernames thows NumberFormatException on Teleport

Refactoring of the Teleport Handling

Supports now:
     * p h xPlotPlayerGuy [PAGE] = Player  [numeric] [alphanumeric]
     * p h MyPlantage      [PAGE] = Alias    [numeric] [alphanumeric]
     * p h PlotworldLarge [PAGE] = World  [numeric] [alphanumeric]
     * p h 1:1		       [PAGE] = plotId  [numeric (1,1|1;2) ]
     * p h 4		                   = 4 th Plot of the Player if available  [numeric (1,1|1;2) ]
Check order: Player, Alias, World, PlotId, Page [PAGE]
[PAGE] is optional

* Apply suggested Code Style

Changes:
Collections now empty instead of null.
Property renaming
This commit is contained in:
Christian Langel 2017-12-03 17:15:09 +01:00 committed by Alexander Söderberg
parent f27b12a211
commit 06208696db
2 changed files with 130 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -1961,6 +1961,28 @@ public class PS{
return null; return null;
} }
} }
/**
* Get Plots based on alias
*
* @param alias to search plots
* @param worldname to filter alias to a specific world [optional] null means all worlds
*
* @return Set<{@link Plot}> empty if nothing found
*/
public Set<Plot> getPlotsByAlias(String alias, String worldname) {
Set<Plot> result = new HashSet<>();
if (alias != null) {
for (Plot plot : getPlots()) {
if (alias.equals(plot.getAlias()) && (worldname == null || worldname.equals(plot.getWorldName()))) {
result.add(plot);
}
}
}
return result;
}
public Set<PlotArea> getPlotAreas(String world, RegionWrapper region) { public Set<PlotArea> getPlotAreas(String world, RegionWrapper region) {
PlotArea[] areas = manager.getPlotAreas(world, region); PlotArea[] areas = manager.getPlotAreas(world, region);

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

@ -5,6 +5,7 @@ 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.PlotArea;
import com.intellectualcrafters.plot.object.PlotId;
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;
@ -17,6 +18,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -31,6 +33,9 @@ import java.util.UUID;
category = CommandCategory.TELEPORT) category = CommandCategory.TELEPORT)
public class Visit extends Command { public class Visit extends Command {
private static final int PAGE_OUT_OF_RANGE = -998899; // this is to flag Page argument is to long. Can occur if someone enters a large number (some player uses numeric names)
private final int MaxPageRange = 100;
public Visit() { public Visit() {
super(MainCommand.getInstance(), true); super(MainCommand.getInstance(), true);
} }
@ -50,54 +55,48 @@ public class Visit extends Command {
PlotArea sortByArea = player.getApplicablePlotArea(); PlotArea sortByArea = player.getApplicablePlotArea();
boolean shouldSortByArea = Settings.Teleport.PER_WORLD_VISIT; boolean shouldSortByArea = Settings.Teleport.PER_WORLD_VISIT;
switch (args.length) { switch (args.length) {
case 3: case 2:
if (!MathMan.isInteger(args[1])) { if (MathMan.isInteger(args[1])) {
C.NOT_VALID_NUMBER.send(player, "(1, ∞)"); page = tryReadPageIdFromArg(player, args[1]);
C.COMMAND_SYNTAX.send(player, getUsage()); } else {
return; C.COMMAND_SYNTAX.send(player, getUsage());
} return;
page = Integer.parseInt(args[2]); }
case 2: // don't add break here. we handle the first argument in case 1
if (!MathMan.isInteger(args[1])) { case 1:
sortByArea = PS.get().getPlotAreaByString(args[1]); boolean isCorrectSyntaxWithoutResults = false;
if (sortByArea == null) { Collection<Plot> plots = new HashSet<Plot>();
C.NOT_VALID_NUMBER.send(player, "(1, ∞)"); if (args[0] != null) {
C.COMMAND_SYNTAX.send(player, getUsage()); plots = getPlotsFromSingleArgument(args[0], sortByArea);
return; if (!plots.isEmpty()) {
} unsorted = plots;
UUID user = UUIDHandler.getUUIDFromString(args[0]); } else {
if (user == null) { if (MathMan.isInteger(args[0])) {
C.COMMAND_SYNTAX.send(player, getUsage()); page = tryReadPageIdFromArg(player, args[0]);
return;
} if (page != PAGE_OUT_OF_RANGE && page != Integer.MIN_VALUE) {
unsorted = PS.get().getBasePlots(user); unsorted = PS.get().getPlots(player);
shouldSortByArea = true; }
break; } else {
} // we know now syntax is correct but no results.
page = Integer.parseInt(args[1]); isCorrectSyntaxWithoutResults = true;
case 1: }
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])) { }
page = Integer.parseInt(args[0]);
unsorted = PS.get().getBasePlots(player); if (!isCorrectSyntaxWithoutResults && plots.isEmpty() && page == Integer.MIN_VALUE) {
break; C.COMMAND_SYNTAX.send(player, getUsage());
} return;
if (user != null) { }
unsorted = PS.get().getBasePlots(user); break;
} else { case 0:
Plot plot = MainUtil.getPlotFromString(player, args[0], true); unsorted = PS.get().getPlots(player);
if (plot != null) { break;
unsorted = Collections.singletonList(plot.getBasePlot(false)); default:
} C.COMMAND_SYNTAX.send(player, getUsage());
} return;
break;
case 0:
page = 1;
unsorted = PS.get().getPlots(player);
break;
default:
} }
if (page == Integer.MIN_VALUE) { if (page == Integer.MIN_VALUE) {
page = 1; page = 1;
} }
@ -112,7 +111,7 @@ public class Visit extends Command {
} }
} }
if (page < 1 || page > unsorted.size()) { if (page < 1 || page > unsorted.size()) {
C.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")"); C.NOT_VALID_NUMBER.send(player, "(1 - " + unsorted.size() + ")");
return; return;
} }
List<Plot> plots; List<Plot> plots;
@ -160,4 +159,65 @@ public class Visit extends Command {
}); });
} }
/**
* Get Plots based on an unknown argument type
* Check order: Player, Alias, World, PlotId
* @param argument to search plots
* <pre>
* Samples:
* p h xPlotPlayerGuy = Player [numeric] [alphanumeric] [UUID]
* p h MyPlantage = Alias [numeric] [alphanumeric] [Set<Plot>]
* p h PlotworldLarge = World [numeric] [alphanumeric] [PlotArea]
* p h 1:1 = plotId [numeric] (1,1|1;2) [PlotId]
* </pre>
* @param applicablePlotArea the area from the player invoked the command
* @return Collection<{@link Plot}> empty if nothing found
*/
private Collection<Plot> getPlotsFromSingleArgument(String argument, PlotArea applicablePlotArea) {
Collection<Plot> result = new HashSet<Plot>();
UUID user = UUIDHandler.getUUIDFromString(argument);
if (user != null) {
result = PS.get().getBasePlots(user);
} else {
result = PS.get().getPlotsByAlias(argument, applicablePlotArea.worldname);
}
if (result.isEmpty()) {
PlotArea plotArea = PS.get().getPlotArea(argument, "0,0");
if (plotArea != null) {
result = plotArea.getBasePlots();
if(result.isEmpty()) {
result = Collections.singletonList(plotArea.getPlot(new PlotId(0, 0)));
}
}
}
if (result.isEmpty()) {
PlotId plotId = PlotId.fromString(argument);
if (plotId != null) {
result = Collections.singletonList(applicablePlotArea.getPlot(plotId));
}
}
return result;
}
private int tryReadPageIdFromArg(PlotPlayer player, String arg) {
int page = Integer.MIN_VALUE;
try {
if (MathMan.isInteger(arg)) {
page = Integer.parseInt(arg);
if (page > MaxPageRange) {
page = PAGE_OUT_OF_RANGE;
}
}
} catch (Exception ignored) {
page = PAGE_OUT_OF_RANGE;
C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
}
return page;
}
} }