mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-29 18:45:26 +02:00
Compare commits
1 Commits
main
...
renovate/s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7e0f03b120 |
@@ -275,7 +275,7 @@ public class MainCommand extends Command {
|
|||||||
private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
|
private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
|
||||||
if (data.args().length >= 2) {
|
if (data.args().length >= 2) {
|
||||||
PlotArea area = data.player().getApplicablePlotArea();
|
PlotArea area = data.player().getApplicablePlotArea();
|
||||||
Plot newPlot = Plot.fromString(area, data.args()[0], data.player());
|
Plot newPlot = Plot.fromString(area, data.args()[0]);
|
||||||
return preparePlotArgument(newPlot, data, area)
|
return preparePlotArgument(newPlot, data, area)
|
||||||
.thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
|
.thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
|
||||||
} else {
|
} else {
|
||||||
|
@@ -321,8 +321,7 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the plot from a string. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
|
* Get the plot from a string.
|
||||||
* (x/z +/- 30,000,000) to prevent crashes
|
|
||||||
*
|
*
|
||||||
* @param player Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
|
* @param player Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
|
||||||
* @param arg The search term
|
* @param arg The search term
|
||||||
@@ -333,31 +332,6 @@ public class Plot {
|
|||||||
final @Nullable PlotPlayer<?> player,
|
final @Nullable PlotPlayer<?> player,
|
||||||
final @Nullable String arg,
|
final @Nullable String arg,
|
||||||
final boolean message
|
final boolean message
|
||||||
) {
|
|
||||||
Plot plot = getPlotFromStringUnchecked(player, arg, message);
|
|
||||||
if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
|
||||||
if (message) {
|
|
||||||
(player == null ? ConsolePlayer.getConsole() : player).sendMessage(TranslatableCaption.of(
|
|
||||||
"invalid.world_location_plot"));
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return plot;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the plot from a string. Does not perform a check on world bounds.
|
|
||||||
*
|
|
||||||
* @param player Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
|
|
||||||
* @param arg The search term
|
|
||||||
* @param message If a message should be sent to the player if a plot cannot be found
|
|
||||||
* @return The plot if only 1 result is found, or null
|
|
||||||
* @since 7.5.5
|
|
||||||
*/
|
|
||||||
public static @Nullable Plot getPlotFromStringUnchecked(
|
|
||||||
final @Nullable PlotPlayer<?> player,
|
|
||||||
final @Nullable String arg,
|
|
||||||
final boolean message
|
|
||||||
) {
|
) {
|
||||||
if (arg == null) {
|
if (arg == null) {
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
@@ -415,51 +389,13 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
|
* Gets a plot from a string e.g. [area];[id]
|
||||||
* (x/z +/- 30,000,000) to prevent crashes
|
|
||||||
*
|
*
|
||||||
* @param defaultArea if no area is specified
|
* @param defaultArea if no area is specified
|
||||||
* @param string plot id/area + id
|
* @param string plot id/area + id
|
||||||
* @return New or existing plot object
|
* @return New or existing plot object
|
||||||
*/
|
*/
|
||||||
public static @Nullable Plot fromString(final @Nullable PlotArea defaultArea, final @NonNull String string) {
|
public static @Nullable Plot fromString(final @Nullable PlotArea defaultArea, final @NonNull String string) {
|
||||||
return fromString(defaultArea, string, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a plot from a string e.g. [area];[id]. Performs a check to ensure Plot#getBottomAbs is not outside world bounds
|
|
||||||
* (x/z +/- 30,000,000) to prevent crashes
|
|
||||||
*
|
|
||||||
* @param defaultArea if no area is specified
|
|
||||||
* @param string plot id/area + id
|
|
||||||
* @param player {@link PlotPlayer} player to notify if plot is invalid (outside bounds)
|
|
||||||
* @return New or existing plot object
|
|
||||||
* @since 7.5.5
|
|
||||||
*/
|
|
||||||
public static @Nullable Plot fromString(
|
|
||||||
final @Nullable PlotArea defaultArea,
|
|
||||||
final @NonNull String string,
|
|
||||||
final @Nullable PlotPlayer<?> player
|
|
||||||
) {
|
|
||||||
Plot plot = fromStringUnchecked(defaultArea, string);
|
|
||||||
if (plot != null && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
|
||||||
if (player != null) {
|
|
||||||
player.sendMessage(TranslatableCaption.of("invalid.world_location_plot"));
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return plot;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a plot from a string e.g. [area];[id]. Does not perform a check on world bounds.
|
|
||||||
*
|
|
||||||
* @param defaultArea if no area is specified
|
|
||||||
* @param string plot id/area + id
|
|
||||||
* @return New or existing plot object
|
|
||||||
* @since 7.5.5
|
|
||||||
*/
|
|
||||||
public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
|
|
||||||
final String[] split = string.split("[;,]");
|
final String[] split = string.split("[;,]");
|
||||||
if (split.length == 2) {
|
if (split.length == 2) {
|
||||||
if (defaultArea != null) {
|
if (defaultArea != null) {
|
||||||
@@ -483,8 +419,7 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a new/cached plot object at a given location. Does not check world bounds for potential crashes, these should be
|
* Return a new/cached plot object at a given location.
|
||||||
* performed before (or after) this method is used.
|
|
||||||
*
|
*
|
||||||
* <p>
|
* <p>
|
||||||
* Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here.
|
* Use {@link PlotPlayer#getCurrentPlot()} if a player is expected here.
|
||||||
|
@@ -371,7 +371,8 @@ public final class PlotModificationManager {
|
|||||||
manager.createRoadSouthEast(current, queue);
|
manager.createRoadSouthEast(current, queue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (current.isMerged(Direction.SOUTH)) {
|
}
|
||||||
|
if (current.isMerged(Direction.SOUTH)) {
|
||||||
manager.createRoadSouth(current, queue);
|
manager.createRoadSouth(current, queue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -67,7 +67,7 @@ public class PlotTitle {
|
|||||||
* Provides a string representation of this plot title value (used in placeholders).
|
* Provides a string representation of this plot title value (used in placeholders).
|
||||||
*
|
*
|
||||||
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
|
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
|
||||||
* @since 7.5.5
|
* @since TODO
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
@@ -234,7 +234,6 @@
|
|||||||
"invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
|
"invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
|
||||||
"invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",
|
"invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",
|
||||||
"invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>",
|
"invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>",
|
||||||
"invalid.world_location_plot": "<prefix><red>The target plot is invalid.</red>",
|
|
||||||
"invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>",
|
"invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>",
|
||||||
"invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>",
|
"invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>",
|
||||||
"invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>",
|
"invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>",
|
||||||
|
@@ -20,7 +20,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.5.6-SNAPSHOT"
|
version = "7.5.5-SNAPSHOT"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
@@ -67,8 +67,8 @@ subprojects {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Tests
|
// Tests
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins.withId("java") {
|
plugins.withId("java") {
|
||||||
|
Reference in New Issue
Block a user