Skip to content

Commit

Permalink
Reset servers to unregistered after removal
Browse files Browse the repository at this point in the history
  • Loading branch information
@ME1312
ME1312 committed Jun 6, 2021
1 parent ee59429 commit ba6af4d
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 19 deletions.
16 changes: 11 additions & 5 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
View file
Expand Up @@ -20,7 +20,6 @@
import net.ME1312.SubServers.Bungee.SubProxy;

import com.google.common.collect.Range;
import net.md_5.bungee.BungeeCord;

import java.net.InetAddress;
import java.util.*;
Expand Down Expand Up @@ -180,7 +179,7 @@ public boolean addSubServer(UUID player, SubServer server) throws InvalidServerE
queue(new PacketExAddServer(((ExternalSubServer) server), (server.isRunning())?((ExternalSubLogger) server.getLogger()).getExternalAddress():null, data -> {
if (data.contains(0x0002)) ((ExternalSubServer) server).started(data.getUUID(0x0002));
}));
((ExternalSubServer) server).register();
((ExternalSubServer) server).registered(true);
servers.put(server.getName().toLowerCase(), server);
return true;
} else {
Expand All @@ -191,18 +190,21 @@ public boolean addSubServer(UUID player, SubServer server) throws InvalidServerE
@Override
protected boolean removeSubServer(UUID player, String name, boolean forced) throws InterruptedException {
if (Util.isNull(name)) throw new NullPointerException();
SubServer server = servers.get(name.toLowerCase());
ExternalSubServer server = (ExternalSubServer) servers.get(name.toLowerCase());

SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, server);
plugin.getPluginManager().callEvent(event);
if (forced || !event.isCancelled()) {
server.registered(false);
if (server.isRunning()) {
server.stop();
server.waitFor();
}

servers.remove(name.toLowerCase());
queue(new PacketExRemoveServer(name.toLowerCase(), data -> {
if (data.getInt(0x0001) != 0 && data.getInt(0x0001) != 1) {
server.registered(true);
servers.put(name.toLowerCase(), server);
}
}));
Expand All @@ -213,12 +215,13 @@ protected boolean removeSubServer(UUID player, String name, boolean forced) thro
@Override
protected boolean recycleSubServer(UUID player, String name, boolean forced) throws InterruptedException {
if (Util.isNull(name)) throw new NullPointerException();
SubServer s = servers.get(name.toLowerCase());
ExternalSubServer s = (ExternalSubServer) servers.get(name.toLowerCase());
String server = s.getName();

SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, s);
plugin.getPluginManager().callEvent(event);
if (forced || !event.isCancelled()) {
s.registered(false);
if (s.isRunning()) {
s.stop();
s.waitFor();
Expand All @@ -243,6 +246,7 @@ protected boolean recycleSubServer(UUID player, String name, boolean forced) thr
servers.remove(server.toLowerCase());
Logger.get("SubServers").info("Deleted SubServer: " + server);
} else {
s.registered(true);
Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
}
}));
Expand All @@ -253,12 +257,13 @@ protected boolean recycleSubServer(UUID player, String name, boolean forced) thr
@Override
protected boolean deleteSubServer(UUID player, String name, boolean forced) throws InterruptedException {
if (Util.isNull(name)) throw new NullPointerException();
SubServer s = servers.get(name.toLowerCase());
ExternalSubServer s = (ExternalSubServer) servers.get(name.toLowerCase());
String server = s.getName();

SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, getSubServer(server));
plugin.getPluginManager().callEvent(event);
if (forced || !event.isCancelled()) {
s.registered(false);
if (s.isRunning()) {
s.stop();
s.waitFor();
Expand All @@ -283,6 +288,7 @@ protected boolean deleteSubServer(UUID player, String name, boolean forced) thro
servers.remove(server.toLowerCase());
Logger.get("SubServers").info("Deleted SubServer: " + server);
} else {
s.registered(true);
Logger.get("SubServers").info("Couldn't remove " + server + " from memory. See " + getName() + " console for more details");
}
}));
Expand Down
4 changes: 2 additions & 2 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java
View file
Expand Up @@ -143,7 +143,7 @@ public boolean update(UUID player, SubServer server, ServerTemplate template, Ve

String name = server.getName();
String prefix = name + File.separator + "Updater";
Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("updating"), server, true));
((ExternalSubServer) server).updating(true);
ExternalSubLogger logger = new ExternalSubLogger(this, prefix, log, null);
thread.put(name.toLowerCase(), new ContainedPair<>(server.getAddress().getPort(), logger));

Expand All @@ -153,7 +153,7 @@ public boolean update(UUID player, SubServer server, ServerTemplate template, Ve
logger.start();
host.queue(new PacketExCreateServer(player, server, ft, version, logger.getExternalAddress(), data -> {
finish(player, server, server.getName(), ft, version, server.getAddress().getPort(), prefix, origin, data, s -> {
Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("updating"), server, false));
((ExternalSubServer) server).updating(false);
if (callback != null) callback.run(s != null);
});
logger.stop();
Expand Down
8 changes: 6 additions & 2 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
View file
Expand Up @@ -97,8 +97,12 @@ private void init(ExternalHost host, String name, boolean enabled, int port, Str
this.lock = false;
}

void register() {
registered = true;
void registered(boolean value) {
registered = value;
}

void updating(boolean value) {
updating = value;
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java
View file
Expand Up @@ -110,7 +110,7 @@ public boolean addSubServer(UUID player, SubServer server) throws InvalidServerE
SubAddServerEvent event = new SubAddServerEvent(player, this, server);
plugin.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
((InternalSubServer) server).register();
((InternalSubServer) server).registered(true);
servers.put(server.getName().toLowerCase(), server);
if (UPnP.isUPnPAvailable() && plugin.config.get().getMap("Settings").getMap("UPnP", new ObjectMap<String>()).getBoolean("Forward-Servers", false)) UPnP.openPortTCP(server.getAddress().getPort());
return true;
Expand All @@ -122,10 +122,11 @@ public boolean addSubServer(UUID player, SubServer server) throws InvalidServerE
@Override
protected boolean removeSubServer(UUID player, String name, boolean forced) throws InterruptedException {
if (Util.isNull(name)) throw new NullPointerException();
SubServer server = servers.get(name.toLowerCase());
InternalSubServer server = (InternalSubServer) servers.get(name.toLowerCase());
SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, server);
plugin.getPluginManager().callEvent(event);
if (forced || !event.isCancelled()) {
server.registered(false);
if (server.isRunning()) {
server.stop();
server.waitFor();
Expand Down
5 changes: 2 additions & 3 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
View file
Expand Up @@ -430,10 +430,9 @@ public boolean update(UUID player, SubServer server, ServerTemplate template, Ve
if (host.isAvailable() && host.isEnabled() && host == server.getHost() && server.isAvailable() && !server.isRunning() && ft != null && ft.isEnabled() && ft.canUpdate() && (version != null || !ft.requiresVersion())) {
StackTraceElement[] origin = new Exception().getStackTrace();

Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("updating"), server, true));

((InternalSubServer) server).updating(true);
CreatorTask task = new CreatorTask(player, server, ft, version, x -> {
Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("updating"), server, false));
((InternalSubServer) server).updating(false);
if (callback != null) try {
callback.run(x != null);
} catch (Throwable e) {
Expand Down
8 changes: 6 additions & 2 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
View file
Expand Up @@ -136,8 +136,12 @@ private void init(InternalHost host, String name, boolean enabled, int port, Str
this.lock = false;
}

void register() {
registered = true;
void registered(boolean value) {
registered = value;
}

void updating(boolean value) {
updating = value;
}

private void run() {
Expand Down
4 changes: 1 addition & 3 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java
View file
Expand Up @@ -20,9 +20,7 @@ public abstract class SubServerImpl extends ServerImpl implements SubServer {
private List<Pair<String, String>> incompatibilities = new ArrayList<Pair<String, String>>();
private SubCreator.ServerTemplate templateV = null;
private String templateS = null;
protected boolean registered;
protected boolean started;
private boolean updating;
protected boolean registered, started, updating;

/**
* Creates a SubServer
Expand Down

0 comments on commit ba6af4d

Please sign in to comment.