Archived
0

Обновление модуля: обновление до последнего API

This commit is contained in:
2016-08-20 14:33:50 +03:00
parent 86e8fde7ec
commit 404f85ad89
3 changed files with 7 additions and 5 deletions

View File

@@ -20,14 +20,14 @@
<groupId>asys.mcserver</groupId>
<artifactId>process-impl</artifactId>
<version>0.2</version>
<version>0.3</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>asys</groupId>
<artifactId>api</artifactId>
<version>0.6</version>
<version>0.10</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>

View File

@@ -26,7 +26,7 @@ public class Activator implements BundleActivator, MinecraftServerFactory {
}
@Override
public MinecraftServer createServer(String name, File directory, String mainJar, String jvmArgs, String params) {
return new MinecraftProcessServer(name, directory, mainJar, jvmArgs, params);
public MinecraftServer createServer(String name, File directory, String mainJar, short port, String jvmArgs, String params) {
return new MinecraftProcessServer(name, directory, mainJar, port, jvmArgs, params);
}
}

View File

@@ -17,7 +17,7 @@ public class MinecraftProcessServer implements MinecraftServer {
private final String name;
private final byte[] newLine = "\r\n".getBytes();
public MinecraftProcessServer(String name, File directory, String mainJar, String jvmArgs, String params) {
public MinecraftProcessServer(String name, File directory, String mainJar, short port, String jvmArgs, String params) {
processBuilder = new ProcessBuilder();
processBuilder.directory(directory);
List<String> commandLine = new Vector<>();
@@ -28,6 +28,8 @@ public class MinecraftProcessServer implements MinecraftServer {
}
commandLine.add("-jar");
commandLine.add(mainJar);
commandLine.add("-p");
commandLine.add(String.valueOf(port));
if ((params != null) && (!params.trim().isEmpty())) {
commandLine.add(params);
}