From f90a54e6368440a7cfa0a9bb6aba6e7a3cac30a6 Mon Sep 17 00:00:00 2001
From: ME1312 <admin@me1312.net>
Date: Wed, 24 Feb 2021 17:09:25 -0500
Subject: [PATCH] Set running to TRUE while running start event

---
 SubServers.Bungee/common/pom.xml                         | 4 ++--
 SubServers.Bungee/pom.xml                                | 4 ++--
 .../Bungee/Host/External/ExternalSubServer.java          | 9 ++++++---
 .../Bungee/Host/Internal/InternalSubServer.java          | 9 ++++++---
 SubServers.Client/Bukkit/pom.xml                         | 2 +-
 SubServers.Client/Common/pom.xml                         | 2 +-
 SubServers.Client/Sponge/pom.xml                         | 2 +-
 SubServers.Host/pom.xml                                  | 4 ++--
 SubServers.Sync/pom.xml                                  | 4 ++--
 9 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml
index 5c9767f6..48baca11 100644
--- a/SubServers.Bungee/common/pom.xml
+++ b/SubServers.Bungee/common/pom.xml
@@ -30,13 +30,13 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index 5788fc21..536fd566 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -30,14 +30,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
index f63c5521..8d010e7b 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
@@ -103,19 +103,22 @@ public class ExternalSubServer extends SubServerImpl {
             lock = true;
             SubStartEvent event = new SubStartEvent(player, this);
             host.plugin.getPluginManager().callEvent(event);
-            lock = false;
             if (!event.isCancelled()) {
                 Logger.get("SubServers").info("Now starting " + getName());
                 started(null);
                 host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.START, logger.getExternalAddress().toString()));
                 return true;
-            } else return false;
+            } else {
+                lock = false;
+                return false;
+            }
         } else return false;
     }
     void started(UUID address) {
         if (!running) {
             started = false;
             running = true;
+            lock = false;
             logger.start();
             if (address != null) {
                 if (address != logger.getExternalAddress()) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_LOGGING_ADDRESS, logger.getExternalAddress().toString()));
@@ -500,7 +503,7 @@ public class ExternalSubServer extends SubServerImpl {
 
     @Override
     public boolean isRunning() {
-        return running;
+        return running || lock;
     }
 
     @Override
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
index 94d82ca0..77ab6cd4 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
@@ -137,6 +137,7 @@ public class InternalSubServer extends SubServerImpl {
     }
 
     private void run() {
+        lock = false;
         allowrestart = true;
         started = false;
         try {
@@ -213,11 +214,13 @@ public class InternalSubServer extends SubServerImpl {
             lock = true;
             SubStartEvent event = new SubStartEvent(player, this);
             host.plugin.getPluginManager().callEvent(event);
-            lock = false;
             if (!event.isCancelled()) {
                 (thread = new Thread(this::run, "SubServers.Bungee::Internal_Server_Process_Handler(" + getName() + ')')).start();
                 return true;
-            } else return false;
+            } else {
+                lock = false;
+                return false;
+            }
         } else return false;
     }
 
@@ -560,7 +563,7 @@ public class InternalSubServer extends SubServerImpl {
 
     @Override
     public boolean isRunning() {
-        return process != null && process.isAlive();
+        return (process != null && process.isAlive()) || lock;
     }
 
     @Override
diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
index 49809520..b37d0dd6 100644
--- a/SubServers.Client/Bukkit/pom.xml
+++ b/SubServers.Client/Bukkit/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml
index 8cd8d60f..52b52183 100644
--- a/SubServers.Client/Common/pom.xml
+++ b/SubServers.Client/Common/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml
index 5910c605..b2c21cc6 100644
--- a/SubServers.Client/Sponge/pom.xml
+++ b/SubServers.Client/Sponge/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index 4ed48459..32130209 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -33,14 +33,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUI</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml
index 857cb90f..2542f83c 100644
--- a/SubServers.Sync/pom.xml
+++ b/SubServers.Sync/pom.xml
@@ -30,14 +30,14 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w08m</version>
+            <version>21w09e</version>
             <scope>provided</scope>
         </dependency>
         <dependency>