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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
provided
net.ME1312.Galaxi
GalaxiEngine
- 21w08m
+ 21w09e
provided
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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
compile
true
net.ME1312.Galaxi
GalaxiEngine
- 21w08m
+ 21w09e
provided
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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
compile
true
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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
provided
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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
compile
true
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 @@
net.ME1312.Galaxi
GalaxiEngine
- 21w08m
+ 21w09e
compile
true
net.ME1312.Galaxi
GalaxiUI
- 21w08m
+ 21w09e
runtime
true
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 @@
net.ME1312.Galaxi
GalaxiUtil
- 21w08m
+ 21w09e
compile
true
net.ME1312.Galaxi
GalaxiEngine
- 21w08m
+ 21w09e
provided