Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct value replacement for server.properties

This commit is contained in:
ME1312 2018-11-21 17:33:52 -05:00
parent d877e80b9f
commit a12ff22645
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
View File

@ -432,7 +432,7 @@ public class InternalSubCreator extends SubCreator {
File file = new File(dir, "server.properties");
if (!file.exists()) file.createNewFile();
InputStream stream = new FileInputStream(file);
String content = Util.readAll(new BufferedReader(new InputStreamReader(stream))).replace("server-port=", "server-port=" + port).replace("server-ip=", "server-ip=" + host.getAddress().getHostAddress());
String content = Util.readAll(new BufferedReader(new InputStreamReader(stream))).replaceAll("server-port=.*(\r?\n)", "server-port=" + port + "$1").replaceAll("server-ip=.*(\r?\n)", "server-ip=" + host.getAddress().getHostAddress() + "$1");
stream.close();
file.delete();
PrintWriter writer = new PrintWriter(file, "UTF-8");

2
SubServers.Creator/src/Spigot/template.yml
View File

@ -7,4 +7,4 @@ Template:
Shell-Location: 'build.sh'
Permission: '+x'
Settings:
Executable: 'java -Xmx1024M -Dorg.bukkit.craftbukkit.libs.jline.terminal=unix -Djansi.passthrough=true -jar Spigot.jar'
Executable: 'java -Xmx1024M -Dorg.bukkit.craftbukkit.libs.jline.terminal=unix -Djansi.passthrough=true -jar Spigot.jar -p $port$'

2
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
View File

@ -429,7 +429,7 @@ public class SubCreator {
File file = new File(dir, "server.properties");
if (!file.exists()) file.createNewFile();
FileInputStream is = new FileInputStream(file);
String content = Util.readAll(new BufferedReader(new InputStreamReader(is))).replace("server-port=", "server-port=" + port).replace("server-ip=", "server-ip=" + host.config.get().getSection("Settings").getRawString("Server-Bind"));
String content = Util.readAll(new BufferedReader(new InputStreamReader(is))).replaceAll("server-port=.*(\r?\n)", "server-port=" + port + "$1").replaceAll("server-ip=.*(\r?\n)", "server-ip=" + host.config.get().getSection("Settings").getRawString("Server-Bind") + "$1");
is.close();
file.delete();
PrintWriter writer = new PrintWriter(file, "UTF-8");