KnarCraft/Minecraft-Server-Launcher
KnarCraft/Minecraft-Server-Launcher
1
0
Fork 0
Code Issues 3 Pull Requests Releases 12 Wiki Activity

Removes the annoying delay before starting the first server when enabling server delay

Browse Source
This commit is contained in:
Kristian Knarvik 2021-01-29 20:30:07 +01:00
parent 8b0423e231
commit fa6a0df4c7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/knarcraft/minecraftserverlauncher/server/Server.java
View File

@ -137,8 +137,9 @@ public class Server {
public static void startServers() { public static void startServers() {
Controller controller = Main.getController(); Controller controller = Main.getController();
controller.getGUI().setStatus("Starting servers"); controller.getGUI().setStatus("Starting servers");
int serverNum = 0;
for (Collection collection : controller.getCurrentProfile().getCollections()) { for (Collection collection : controller.getCurrentProfile().getCollections()) {
if (!collection.getServer().runServer()) { if (!collection.getServer().runServer(serverNum++ == 0)) {
controller.getGUI().setStatus("An error occurred. Start aborted"); controller.getGUI().setStatus("An error occurred. Start aborted");
try { try {
Server.stop(); Server.stop();
@ -359,14 +360,14 @@ public class Server {
* *
* @return <p>True if nothing went wrong</p> * @return <p>True if nothing went wrong</p>
*/ */
private boolean runServer() { private boolean runServer(boolean isFirstServer) {
//Ignore a disabled server //Ignore a disabled server
if (!this.enabled) { if (!this.enabled) {
this.started = false; this.started = false;
return true; return true;
} }
//Tries to do necessary pre-start work //Tries to do necessary pre-start work
if (!initializeJarDownload() || !delayStartup()) { if (!initializeJarDownload() || (!isFirstServer && !delayStartup())) {
this.started = false; this.started = false;
return false; return false;
} }