Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ protected void writeServerProperties(String properties)
* Creates the default server properties content for an offline-mode integration server.
*
* @return The server properties content.
*
* @throws MojoExecutionException
* If no free local TCP port can be reserved.
*/
Expand Down Expand Up @@ -306,10 +307,9 @@ protected void configureSpigotWatchdogTimeout()
lines.add(settingsLineIndex + 1, settingsLineIndentation + " timeout-time: " +
SPIGOT_WATCHDOG_TIMEOUT_SECONDS);
}
else
else if (!lines.isEmpty() && !lines.getLast().isBlank())
{
if (!lines.isEmpty() && !lines.get(lines.size() - 1).isBlank())
lines.add("");
lines.add("");
lines.add("settings:");
lines.add(" timeout-time: " + SPIGOT_WATCHDOG_TIMEOUT_SECONDS);
}
Expand Down Expand Up @@ -338,6 +338,7 @@ protected void configureSpigotWatchdogTimeout()
* Reserves an available local TCP port.
*
* @return A currently available local TCP port.
*
* @throws MojoExecutionException
* If no local TCP port could be reserved.
*/
Expand Down Expand Up @@ -415,8 +416,10 @@ public final void prepareServer()
/**
* Creates the same provider with durable runtime output locations while retaining all resolved server inputs.
*
* @param serverWorkDirectoryRoot Root directory for the prepared runtime.
* @param runtimeManifestPath Runtime manifest destination.
* @param serverWorkDirectoryRoot
* Root directory for the prepared runtime.
* @param runtimeManifestPath
* Runtime manifest destination.
* @return A provider using the supplied runtime output locations.
*/
public final ServerProvider withRuntimeLocations(Path serverWorkDirectoryRoot, Path runtimeManifestPath)
Expand All @@ -427,7 +430,8 @@ public final ServerProvider withRuntimeLocations(Path serverWorkDirectoryRoot, P
/**
* Recreates this resolved provider with a copied server specification.
*
* @param specification Copied server specification.
* @param specification
* Copied server specification.
* @return The recreated provider.
*/
protected abstract ServerProvider recreate(ServerSpecification specification);
Expand Down Expand Up @@ -599,6 +603,7 @@ protected void rewriteTargetServerPropertiesWithReservedPort()
* Reserves a target-server TCP port.
*
* @return A currently available local TCP port.
*
* @throws MojoExecutionException
* If no local TCP port could be reserved.
*/
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<version.nullaway>0.14.3</version.nullaway>
<version.inventorygui>1.6.5-SNAPSHOT</version.inventorygui>
<version.spigot-api>${lightkeeper.minecraft-version}-R0.2-SNAPSHOT</version.spigot-api>
<version.pmd>7.23.0</version.pmd>
<version.pmd>7.29.0</version.pmd>
<version.semver4j>6.0.0</version.semver4j>

<version.maven-checkstyle-plugin>3.6.0</version.maven-checkstyle-plugin>
Expand Down
Loading