mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-31 03:25:27 +02:00
Compare commits
10 Commits
feat/v7/wo
...
main
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e5943ba627 | ||
![]() |
07dfdeef2c | ||
![]() |
025b08e716 | ||
![]() |
921435689e | ||
![]() |
aae154b23a | ||
![]() |
0f33465d76 | ||
![]() |
438f1d9656 | ||
![]() |
cb38aeef93 | ||
![]() |
7be0655b86 | ||
![]() |
774298bef5 |
@@ -352,7 +352,7 @@ public class Plot {
|
|||||||
* @param arg The search term
|
* @param arg The search term
|
||||||
* @param message If a message should be sent to the player if a plot cannot be found
|
* @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
|
* @return The plot if only 1 result is found, or null
|
||||||
* @since TODO
|
* @since 7.5.5
|
||||||
*/
|
*/
|
||||||
public static @Nullable Plot getPlotFromStringUnchecked(
|
public static @Nullable Plot getPlotFromStringUnchecked(
|
||||||
final @Nullable PlotPlayer<?> player,
|
final @Nullable PlotPlayer<?> player,
|
||||||
@@ -434,7 +434,7 @@ public class Plot {
|
|||||||
* @param string plot id/area + id
|
* @param string plot id/area + id
|
||||||
* @param player {@link PlotPlayer} player to notify if plot is invalid (outside bounds)
|
* @param player {@link PlotPlayer} player to notify if plot is invalid (outside bounds)
|
||||||
* @return New or existing plot object
|
* @return New or existing plot object
|
||||||
* @since TODO
|
* @since 7.5.5
|
||||||
*/
|
*/
|
||||||
public static @Nullable Plot fromString(
|
public static @Nullable Plot fromString(
|
||||||
final @Nullable PlotArea defaultArea,
|
final @Nullable PlotArea defaultArea,
|
||||||
@@ -457,7 +457,7 @@ public class Plot {
|
|||||||
* @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
|
||||||
* @since TODO
|
* @since 7.5.5
|
||||||
*/
|
*/
|
||||||
public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
|
public static @Nullable Plot fromStringUnchecked(final @Nullable PlotArea defaultArea, final @NonNull String string) {
|
||||||
final String[] split = string.split("[;,]");
|
final String[] split = string.split("[;,]");
|
||||||
|
@@ -371,8 +371,7 @@ 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 TODO
|
* @since 7.5.5
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
@@ -20,7 +20,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.5.5-SNAPSHOT"
|
version = "7.5.7-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.3")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins.withId("java") {
|
plugins.withId("java") {
|
||||||
|
@@ -8,7 +8,7 @@ gson = "2.10"
|
|||||||
guava = "31.1-jre"
|
guava = "31.1-jre"
|
||||||
snakeyaml = "2.0"
|
snakeyaml = "2.0"
|
||||||
adventure = "4.23.0"
|
adventure = "4.23.0"
|
||||||
adventure-bukkit = "4.4.0"
|
adventure-bukkit = "4.4.1"
|
||||||
log4j = "2.19.0"
|
log4j = "2.19.0"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
@@ -35,7 +35,7 @@ serverlib = "2.3.7"
|
|||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.3.8"
|
shadow = "8.3.8"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "7.2.0"
|
spotless = "7.2.1"
|
||||||
publish = "0.34.0"
|
publish = "0.34.0"
|
||||||
runPaper = "2.3.1"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user