From 404f85ad8982a2299a42ec10687970575472e5a1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 20 Aug 2016 14:33:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F:=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- McProcessServer/pom.xml | 4 ++-- McProcessServer/src/main/java/asys/mcserver/Activator.java | 4 ++-- .../src/main/java/asys/mcserver/MinecraftProcessServer.java | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/McProcessServer/pom.xml b/McProcessServer/pom.xml index de42834..a695cc2 100644 --- a/McProcessServer/pom.xml +++ b/McProcessServer/pom.xml @@ -20,14 +20,14 @@ asys.mcserver process-impl - 0.2 + 0.3 bundle asys api - 0.6 + 0.10 org.osgi diff --git a/McProcessServer/src/main/java/asys/mcserver/Activator.java b/McProcessServer/src/main/java/asys/mcserver/Activator.java index cd7ae5a..b52a898 100644 --- a/McProcessServer/src/main/java/asys/mcserver/Activator.java +++ b/McProcessServer/src/main/java/asys/mcserver/Activator.java @@ -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); } } diff --git a/McProcessServer/src/main/java/asys/mcserver/MinecraftProcessServer.java b/McProcessServer/src/main/java/asys/mcserver/MinecraftProcessServer.java index 96e7ee8..72695bf 100644 --- a/McProcessServer/src/main/java/asys/mcserver/MinecraftProcessServer.java +++ b/McProcessServer/src/main/java/asys/mcserver/MinecraftProcessServer.java @@ -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 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); }