Compare commits

...

4 Commits

Author SHA1 Message Date
Alexander Brandes
0f33465d76 Release 7.5.5
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-07-29 18:33:50 +02:00
renovate[bot]
438f1d9656 Update junit-framework monorepo (#4715)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-28 16:00:43 +00:00
renovate[bot]
cb38aeef93 Update dependency com.diffplug.spotless to v7.2.1 (#4714)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-28 16:00:13 +00:00
Jordan
7be0655b86 fix: do not create south road twice on unlink (#4713)
- this was changed from else if to if in 7623698a00 (diff-b05df598e90ce5418467b07e84ef85a80be8bac7c70929063ace9ede4d5cf52eL1000) (for unknown reason)
 - fixes #4704
2025-07-28 13:44:55 +02:00
5 changed files with 9 additions and 10 deletions

View File

@@ -352,7 +352,7 @@ public class Plot {
* @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 TODO
* @since 7.5.5
*/
public static @Nullable Plot getPlotFromStringUnchecked(
final @Nullable PlotPlayer<?> player,
@@ -434,7 +434,7 @@ public class Plot {
* @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 TODO
* @since 7.5.5
*/
public static @Nullable Plot fromString(
final @Nullable PlotArea defaultArea,
@@ -457,7 +457,7 @@ public class Plot {
* @param defaultArea if no area is specified
* @param string plot id/area + id
* @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) {
final String[] split = string.split("[;,]");

View File

@@ -371,8 +371,7 @@ public final class PlotModificationManager {
manager.createRoadSouthEast(current, queue);
}
}
}
if (current.isMerged(Direction.SOUTH)) {
} else if (current.isMerged(Direction.SOUTH)) {
manager.createRoadSouth(current, queue);
}
}

View File

@@ -67,7 +67,7 @@ public class PlotTitle {
* Provides a string representation of this plot title value (used in placeholders).
*
* @return the plot title representation in the format {@code "<title>" "<subtitle>"}
* @since TODO
* @since 7.5.5
*/
@Override
public String toString() {

View File

@@ -20,7 +20,7 @@ plugins {
}
group = "com.intellectualsites.plotsquared"
version = "7.5.5-SNAPSHOT"
version = "7.5.5"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""
@@ -67,8 +67,8 @@ subprojects {
dependencies {
// Tests
testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.3")
testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
}
plugins.withId("java") {

View File

@@ -35,7 +35,7 @@ serverlib = "2.3.7"
# Gradle plugins
shadow = "8.3.8"
grgit = "4.1.1"
spotless = "7.2.0"
spotless = "7.2.1"
publish = "0.34.0"
runPaper = "2.3.1"