Merge 71ef49ed11e8b2d0a7b0ceb7fce56f46799dd60d into 5121ab6f0113905232601b8efbeb9d170d189251
This commit is contained in:
VADemon
GitHub
commit
f64ea444e3
@ -170,6 +170,8 @@ public class FileRead {
|
||||
} else {
|
||||
var.waitSave = false;
|
||||
}
|
||||
} else if (property.equals("postShutdownDelay")) {
|
||||
var.postShutdownDelay = value.toLowerCase().equals("true") ? true : false;
|
||||
} else if (property.equals("weblaunch")) {
|
||||
if (value.toLowerCase().equals("true")) {
|
||||
var.webLaunch = true;
|
||||
|
||||
@ -102,6 +102,8 @@ public class FileWrite {
|
||||
+ var.newLine
|
||||
+ "#Optional: Wait a few seconds after saving." + var.newLine
|
||||
+ "WaitSave=false" + var.newLine
|
||||
+ "#Optional: Wait a few seconds after server shutdown for OS memory housekeeping."
|
||||
+ "postShutdownDelay=false"
|
||||
+ "webLaunch=true";
|
||||
//@formatter:on
|
||||
|
||||
|
||||
@ -32,291 +32,344 @@ public class Server {
|
||||
if (var.verbose) {
|
||||
Out.out("Starting server.");
|
||||
}
|
||||
int startCount = 0;
|
||||
|
||||
boolean serverSuccess = true;
|
||||
boolean warning = false;
|
||||
boolean warningsWeCanIgnore = false;
|
||||
boolean serverDoneReceived = false;
|
||||
final boolean ignoreWarningsOriginal = var.ignoreWarnings;
|
||||
|
||||
// monitor output and print to console where required.
|
||||
// STOP the server when it's done.
|
||||
while (serverSuccess && !serverDoneReceived) {
|
||||
if (++startCount > 1)
|
||||
Out.outP("Restarting server, try #" + startCount
|
||||
+ ": did not receive \"" + var.doneText + "\"\n");
|
||||
|
||||
if (var.alternate) { // Alternate - a replication (slightly stripped down) of MLG 1.3.0's code. simplest code possible.
|
||||
Out.out("Alternate Launch");
|
||||
final Process process = var.minecraft.start();
|
||||
if (var.alternate) { // Alternate - a replication (slightly stripped down) of MLG 1.3.0's code. simplest code possible.
|
||||
Out.out("Alternate Launch");
|
||||
final Process process = var.minecraft.start();
|
||||
|
||||
final byte[] saveAll = { 's', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n' };
|
||||
final byte[] stop = { 's', 't', 'o', 'p', '\r', '\n' };
|
||||
final byte[] saveAll = {'s', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n'};
|
||||
final byte[] stop = {'s', 't', 'o', 'p', '\r', '\n'};
|
||||
|
||||
// monitor output and print to console where required.
|
||||
// STOP the server when it's done.
|
||||
final BufferedReader pOut =
|
||||
// monitor output and print to console where required.
|
||||
// STOP the server when it's done.
|
||||
final BufferedReader pOut =
|
||||
new BufferedReader(new InputStreamReader(process.getInputStream()));
|
||||
String line;
|
||||
while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits
|
||||
String line;
|
||||
while ((line = pOut.readLine())
|
||||
!= null) { // readLine() returns null when the process exits
|
||||
|
||||
line = line.trim();
|
||||
line = line.trim();
|
||||
|
||||
System.out.println(line);
|
||||
if (line.contains(var.doneText)) { // EDITED By Morlok8k for Minecraft 1.3+ Beta
|
||||
final OutputStream outputStream = process.getOutputStream();
|
||||
System.out.println(line);
|
||||
if (line.contains(var.doneText)) { // EDITED By Morlok8k for Minecraft 1.3+ Beta
|
||||
final OutputStream outputStream = process.getOutputStream();
|
||||
|
||||
Out.out("Stopping server... (Please Wait...)");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
serverDoneReceived = true;
|
||||
|
||||
}
|
||||
}
|
||||
// End while loop
|
||||
Out.out("Stopping server... (Please Wait...)");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
|
||||
} else { // start minecraft server normally!
|
||||
final Process process = var.minecraft.start();
|
||||
if (var.verbose) {
|
||||
Out.out("Started Server.");
|
||||
}
|
||||
final BufferedReader pOut =
|
||||
new BufferedReader(new InputStreamReader(process.getInputStream()));
|
||||
if (var.verbose) {
|
||||
Out.out("Accessing Server Output...");
|
||||
}
|
||||
|
||||
String line = null;
|
||||
String shortLine = null;
|
||||
String outTmp = "";
|
||||
String outTmp2 = null;
|
||||
|
||||
final byte[] stop = { 's', 't', 'o', 'p', '\r', '\n' }; // Moved here, so this code wont run every loop, thus Faster!
|
||||
// and no, i can't use a string here!
|
||||
|
||||
final byte[] saveAll = { 's', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n' };
|
||||
|
||||
boolean prepTextFirst = true;
|
||||
|
||||
final OutputStream outputStream = process.getOutputStream(); // moved here to remove some redundancy
|
||||
|
||||
boolean convertedMapFormattingFlag = false; // This allows MLG to track if we converted a map to a new format (such as Chunk-file -> McRegion, or McRegion -> Anvil)
|
||||
// just so it gets a line ending after the % output finishes
|
||||
while ((line = pOut.readLine()) != null) { // readLine() returns null when the process exits
|
||||
|
||||
line = line.trim();
|
||||
|
||||
final int posBracket = line.indexOf("]"); //changed from .lastIndexOf to .indexOf, in case we have a custom server that outputs something with an "]". we want the first one anyways.
|
||||
if (posBracket != -1) {
|
||||
if ((posBracket + 2) >= line.length()) {
|
||||
shortLine = line; //On error messages with 1.7 based servers, there is a "]" at the end of the line. caused a crash here.
|
||||
} else {
|
||||
shortLine = line.substring(posBracket + 2);
|
||||
}
|
||||
|
||||
if (shortLine != null) {
|
||||
shortLine = shortLine.trim(); // new version of Eclipse was giving a warning that it could be null here - it can't, since "shortLine" is based on "line" which is never null at this point.
|
||||
} // added this check to remove warning, as i didn't want to suppress all null warnings for runMinecraft
|
||||
|
||||
} else {
|
||||
shortLine = line;
|
||||
}
|
||||
// End while loop
|
||||
|
||||
} else { // start minecraft server normally!
|
||||
final Process process = var.minecraft.start();
|
||||
if (var.verbose) {
|
||||
Out.outS(shortLine);
|
||||
//} else if (line.toLowerCase().contains("saving")) { //this was just clutter
|
||||
// Main.outS(shortLine);
|
||||
} else if (line.contains(var.preparingText) || line.contains("Converting...")) {
|
||||
if (line.contains("Converting...")) {
|
||||
convertedMapFormattingFlag = true;
|
||||
}
|
||||
outTmp2 = line.substring(line.length() - 3, line.length());
|
||||
outTmp2 = outTmp2.trim(); //we are removing extra spaces here
|
||||
Out.out("Started Server.");
|
||||
}
|
||||
final BufferedReader pOut =
|
||||
new BufferedReader(new InputStreamReader(process.getInputStream()));
|
||||
if (var.verbose) {
|
||||
Out.out("Accessing Server Output...");
|
||||
}
|
||||
|
||||
//if (outTmp.equals(outTmp2)) {
|
||||
//instead of printing the same number, we add another dot
|
||||
//Main.outP(".");
|
||||
//} else {
|
||||
outTmp = outTmp2;
|
||||
String line = null;
|
||||
String shortLine = null;
|
||||
String outTmp = "";
|
||||
String outTmp2 = null;
|
||||
|
||||
final byte[] stop = {'s', 't', 'o', 'p', '\r',
|
||||
'\n'}; // Moved here, so this code wont run every loop, thus Faster!
|
||||
// and no, i can't use a string here!
|
||||
|
||||
final byte[] saveAll = {'s', 'a', 'v', 'e', '-', 'a', 'l', 'l', '\r', '\n'};
|
||||
|
||||
boolean prepTextFirst = true;
|
||||
|
||||
final OutputStream outputStream = process
|
||||
.getOutputStream(); // moved here to remove some redundancy
|
||||
|
||||
boolean convertedMapFormattingFlag = false; // This allows MLG to track if we converted a map to a new format (such as Chunk-file -> McRegion, or McRegion -> Anvil)
|
||||
// just so it gets a line ending after the % output finishes
|
||||
while ((line = pOut.readLine())
|
||||
!= null) { // readLine() returns null when the process exits
|
||||
|
||||
line = line.trim();
|
||||
|
||||
final int posBracket = line.indexOf(
|
||||
"]"); //changed from .lastIndexOf to .indexOf, in case we have a custom server that outputs something with an "]". we want the first one anyways.
|
||||
if (posBracket != -1) {
|
||||
if ((posBracket + 2) >= line.length()) {
|
||||
shortLine = line; //On error messages with 1.7 based servers, there is a "]" at the end of the line. caused a crash here.
|
||||
} else {
|
||||
shortLine = line.substring(posBracket + 2);
|
||||
}
|
||||
|
||||
if (shortLine != null) {
|
||||
shortLine = shortLine
|
||||
.trim(); // new version of Eclipse was giving a warning that it could be null here - it can't, since "shortLine" is based on "line" which is never null at this point.
|
||||
} // added this check to remove warning, as i didn't want to suppress all null warnings for runMinecraft
|
||||
|
||||
if (prepTextFirst) {
|
||||
Out.outP(var.MLG + outTmp + "...");
|
||||
prepTextFirst = false;
|
||||
} else {
|
||||
//Main.outP(" " + outTmp + "...");
|
||||
Out.outP("\r" + var.MLG + outTmp + "..."); //here we use \r to go back to the previous line, and rewrite it
|
||||
shortLine = line;
|
||||
}
|
||||
|
||||
//}
|
||||
if (var.verbose) {
|
||||
Out.outS(shortLine);
|
||||
//} else if (line.toLowerCase().contains("saving")) { //this was just clutter
|
||||
// Main.outS(shortLine);
|
||||
} else if (line.contains(var.preparingText) || line.contains("Converting...")) {
|
||||
if (line.contains("Converting...")) {
|
||||
convertedMapFormattingFlag = true;
|
||||
}
|
||||
outTmp2 = line.substring(line.length() - 3, line.length());
|
||||
outTmp2 = outTmp2.trim(); //we are removing extra spaces here
|
||||
|
||||
} else if (line.contains(var.preparingLevel)) {
|
||||
prepTextFirst = true;
|
||||
//if (outTmp.equals(outTmp2)) {
|
||||
//instead of printing the same number, we add another dot
|
||||
//Main.outP(".");
|
||||
//} else {
|
||||
outTmp = outTmp2;
|
||||
|
||||
if (prepTextFirst) {
|
||||
Out.outP(var.MLG + outTmp + "...");
|
||||
prepTextFirst = false;
|
||||
} else {
|
||||
//Main.outP(" " + outTmp + "...");
|
||||
Out.outP("\r" + var.MLG + outTmp
|
||||
+ "..."); //here we use \r to go back to the previous line, and rewrite it
|
||||
}
|
||||
|
||||
//}
|
||||
|
||||
} else if (line.contains(var.preparingLevel)) {
|
||||
prepTextFirst = true;
|
||||
|
||||
if (convertedMapFormattingFlag == true) {
|
||||
Out.outP(var.newLine);
|
||||
convertedMapFormattingFlag = false;
|
||||
}
|
||||
|
||||
if (line.contains("level 0")) { // "Preparing start region for level 0"
|
||||
Out.outP(
|
||||
var.MLG + var.worldName + ": " + var.level_0 + ":" + var.newLine);
|
||||
} else if (line
|
||||
.contains("level 1")) { // "Preparing start region for level 1"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_1 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 2")) { // "Preparing start region for level 2"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_2 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 3")) { // "Preparing start region for level 3"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_3 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 4")) { // "Preparing start region for level 4"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_4 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 5")) { // "Preparing start region for level 5"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_5 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 6")) { // "Preparing start region for level 6"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_6 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 7")) { // "Preparing start region for level 7"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_7 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 8")) { // "Preparing start region for level 8"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_8 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line
|
||||
.contains("level 9")) { // "Preparing start region for level 9"
|
||||
Out.outP(
|
||||
var.newLine + var.MLG + var.worldName + ": " + var.level_9 + ":"
|
||||
+ var.newLine);
|
||||
} else {
|
||||
Out.outP(var.newLine + var.MLG + shortLine + var.newLine);
|
||||
}
|
||||
} else if (line.contains("server version") || line
|
||||
.contains("Converting map!")) { //TODO: add to .conf
|
||||
Out.outS(shortLine);
|
||||
|
||||
if (line.contains("server version") && var.MC_Server_Version.isEmpty()) {
|
||||
// if server version, save string to variable, for use in arraylist save file.
|
||||
var.MC_Server_Version = shortLine;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (line.contains(var.doneText)) { // now this is configurable!
|
||||
|
||||
serverDoneReceived = true;
|
||||
|
||||
if (convertedMapFormattingFlag == true) {
|
||||
Out.outP(var.newLine);
|
||||
convertedMapFormattingFlag = false;
|
||||
}
|
||||
Out.outS(line.substring(line.lastIndexOf("]") + 2, line.indexOf("!")));
|
||||
if (var.waitSave) {
|
||||
Out.out("Waiting 30 seconds to save...");
|
||||
|
||||
if (line.contains("level 0")) { // "Preparing start region for level 0"
|
||||
Out.outP(var.MLG + var.worldName + ": " + var.level_0 + ":" + var.newLine);
|
||||
} else if (line.contains("level 1")) { // "Preparing start region for level 1"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_1 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 2")) { // "Preparing start region for level 2"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_2 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 3")) { // "Preparing start region for level 3"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_3 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 4")) { // "Preparing start region for level 4"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_4 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 5")) { // "Preparing start region for level 5"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_5 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 6")) { // "Preparing start region for level 6"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_6 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 7")) { // "Preparing start region for level 7"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_7 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 8")) { // "Preparing start region for level 8"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_8 + ":"
|
||||
+ var.newLine);
|
||||
} else if (line.contains("level 9")) { // "Preparing start region for level 9"
|
||||
Out.outP(var.newLine + var.MLG + var.worldName + ": " + var.level_9 + ":"
|
||||
+ var.newLine);
|
||||
} else {
|
||||
Out.outP(var.newLine + var.MLG + shortLine + var.newLine);
|
||||
}
|
||||
} else if (line.contains("server version") || line.contains("Converting map!")) { //TODO: add to .conf
|
||||
Out.outS(shortLine);
|
||||
int count = 1;
|
||||
while (count <= 30) {
|
||||
Out.outP(".");
|
||||
|
||||
if (line.contains("server version") && var.MC_Server_Version.isEmpty()) {
|
||||
// if server version, save string to variable, for use in arraylist save file.
|
||||
var.MC_Server_Version = shortLine;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (line.contains(var.doneText)) { // now this is configurable!
|
||||
|
||||
Out.outP(var.newLine);
|
||||
Out.outS(line.substring(line.lastIndexOf("]") + 2, line.indexOf("!")));
|
||||
if (var.waitSave) {
|
||||
Out.out("Waiting 30 seconds to save...");
|
||||
|
||||
int count = 1;
|
||||
while (count <= 30) {
|
||||
Out.outP(".");
|
||||
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (final InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (final InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
count += 1;
|
||||
}
|
||||
count += 1;
|
||||
Out.out("");
|
||||
}
|
||||
Out.out("");
|
||||
}
|
||||
Out.out("Saving server data...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
Out.out("Saving server data...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
|
||||
Out.out("Stopping server... (Please Wait...)");
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
Out.out("Stopping server... (Please Wait...)");
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
|
||||
if (var.waitSave) {
|
||||
Out.out("Waiting 10 seconds to save.");
|
||||
int count = 1;
|
||||
while (count <= 10) {
|
||||
Out.outP(".");
|
||||
if (var.waitSave) {
|
||||
Out.out("Waiting 10 seconds to save.");
|
||||
int count = 1;
|
||||
while (count <= 10) {
|
||||
Out.outP(".");
|
||||
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (final InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (final InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
count += 1;
|
||||
}
|
||||
count += 1;
|
||||
Out.out("");
|
||||
}
|
||||
Out.out("");
|
||||
}
|
||||
}
|
||||
|
||||
//Here we want to ignore the most common warning: "Can't keep up!"
|
||||
if (line.contains("Can't keep up!")) { //TODO: add to .conf
|
||||
warningsWeCanIgnore = true; //[WARNING] Can't keep up! Did the system time change, or is the server overloaded?
|
||||
var.ignoreWarnings = true;
|
||||
} else if (line.contains("[WARNING] To start the server with more ram")) {
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
}
|
||||
warningsWeCanIgnore = true; //we can safely ignore this...
|
||||
var.ignoreWarnings = true;
|
||||
} else if (line.contains("Error occurred during initialization of VM")
|
||||
//Here we want to ignore the most common warning: "Can't keep up!"
|
||||
if (line.contains("Can't keep up!")) { //TODO: add to .conf
|
||||
warningsWeCanIgnore = true; //[WARNING] Can't keep up! Did the system time change, or is the server overloaded?
|
||||
var.ignoreWarnings = true;
|
||||
} else if (line.contains("[WARNING] To start the server with more ram")) {
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
}
|
||||
warningsWeCanIgnore = true; //we can safely ignore this...
|
||||
var.ignoreWarnings = true;
|
||||
} else if (line.contains("Error occurred during initialization of VM")
|
||||
|| line.contains("Could not reserve enough space for object heap")) {
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outP("[Java Error] " + line);
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outP("[Java Error] " + line);
|
||||
}
|
||||
warning = true;
|
||||
}
|
||||
warning = true;
|
||||
}
|
||||
|
||||
if (var.ignoreWarnings == false) {
|
||||
if (line.contains("[WARNING]")) { // If we have a warning, stop...
|
||||
Out.out("");
|
||||
Out.out("Warning found: Stopping " + var.PROG_NAME);
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
if (var.ignoreWarnings == false) {
|
||||
if (line.contains("[WARNING]")) { // If we have a warning, stop...
|
||||
Out.out("");
|
||||
Out.out("Warning found: Stopping " + var.PROG_NAME);
|
||||
if (var.verbose
|
||||
== false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
}
|
||||
Out.out("");
|
||||
Out.out("Forcing Save...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(
|
||||
stop); // if the warning was a fail to bind to port, we may need to write stop twice!
|
||||
outputStream.flush();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
warning = true;
|
||||
// System.exit(1);
|
||||
}
|
||||
if (line.contains("[SEVERE]")) { // If we have a severe error, stop...
|
||||
Out.out("");
|
||||
Out.out("Severe error found: Stopping server.");
|
||||
if (var.verbose
|
||||
== false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
}
|
||||
Out.out("");
|
||||
Out.out("Forcing Save...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
outputStream.write(stop); // sometimes we need to do stop twice...
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
warning = true;
|
||||
// System.exit(1);
|
||||
// Quit!
|
||||
}
|
||||
Out.out("");
|
||||
Out.out("Forcing Save...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(stop); // if the warning was a fail to bind to port, we may need to write stop twice!
|
||||
outputStream.flush();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
warning = true;
|
||||
// System.exit(1);
|
||||
}
|
||||
if (line.contains("[SEVERE]")) { // If we have a severe error, stop...
|
||||
Out.out("");
|
||||
Out.out("Severe error found: Stopping server.");
|
||||
if (var.verbose == false) { // If verbose is true, we already displayed it.
|
||||
Out.outS(line);
|
||||
}
|
||||
Out.out("");
|
||||
Out.out("Forcing Save...");
|
||||
outputStream.write(saveAll);
|
||||
outputStream.flush();
|
||||
// OutputStream outputStream = process.getOutputStream();
|
||||
outputStream.write(stop);
|
||||
outputStream.flush();
|
||||
outputStream.write(stop); // sometimes we need to do stop twice...
|
||||
outputStream.flush();
|
||||
// outputStream.close();
|
||||
warning = true;
|
||||
// System.exit(1);
|
||||
// Quit!
|
||||
|
||||
if (warningsWeCanIgnore) {
|
||||
var.ignoreWarnings = ignoreWarningsOriginal;
|
||||
}
|
||||
}
|
||||
|
||||
if (warningsWeCanIgnore) {
|
||||
var.ignoreWarnings = ignoreWarningsOriginal;
|
||||
if (warning
|
||||
== true) { // in 1.4.4 we had a issue. tried to write stop twice, but we had closed the stream already. this, and other lines should fix this.
|
||||
outputStream.flush();
|
||||
//outputStream.close();
|
||||
//System.exit(1);
|
||||
serverSuccess = false;
|
||||
}
|
||||
|
||||
outputStream.close();
|
||||
}
|
||||
|
||||
if (warning == true) { // in 1.4.4 we had a issue. tried to write stop twice, but we had closed the stream already. this, and other lines should fix this.
|
||||
outputStream.flush();
|
||||
//outputStream.close();
|
||||
//System.exit(1);
|
||||
serverSuccess = false;
|
||||
}
|
||||
// while loop has finished now.
|
||||
// tfw while loop so big you need a comment to see where it ended ~V
|
||||
|
||||
outputStream.close();
|
||||
// workaround for Windows not instantly freeing virtmem after exit
|
||||
|
||||
// TODO: Seems broken (not triggering)
|
||||
if (var.postShutdownDelay) {
|
||||
try {
|
||||
Thread.sleep(2500);
|
||||
} catch (InterruptedException ex) { }
|
||||
}
|
||||
}
|
||||
|
||||
// while loop has finished now.
|
||||
return serverSuccess;
|
||||
return serverSuccess && serverDoneReceived;
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,10 +47,10 @@ public class var {
|
||||
public static final String PROG_NAME = "Minecraft Land Generator";
|
||||
|
||||
/** Version Number! */
|
||||
public static final String VERSION = "1.7.7";
|
||||
public static final String VERSION = "1.7.8";
|
||||
|
||||
/** Authors */
|
||||
public static final String AUTHORS = "Corrodias, Morlok8k, pr0f1x, jaseg, Gallion";
|
||||
public static final String AUTHORS = "Corrodias, Morlok8k, pr0f1x, jaseg, Gallion, VADemon";
|
||||
|
||||
/** Website */
|
||||
public static final String WEBSITE = "https://sites.google.com/site/minecraftlandgenerator/";
|
||||
@ -185,6 +185,9 @@ public class var {
|
||||
/** Beta 1.9 glitch workaround. (not needed unless using beta 1.9) */
|
||||
public static boolean waitSave = false;
|
||||
|
||||
/** Delay shutdown to give OS time to free memory from current application **/
|
||||
public static boolean postShutdownDelay = false;
|
||||
|
||||
/** Ignores Warnings from the server. Used for compatibility and special cases */
|
||||
public static boolean ignoreWarnings = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user