Skip to content

Commit

Permalink
Send off reload packet only when api.ready
Browse files Browse the repository at this point in the history
  • Loading branch information
@ME1312
ME1312 committed Aug 10, 2018
1 parent 2150979 commit cb7b396
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 19 deletions.
6 changes: 3 additions & 3 deletions ...vers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java
View file
Expand Up @@ -52,13 +52,13 @@ public YAMLSection generate() {
YAMLSection data = new YAMLSection();
data.set("id", id);

YAMLSection exServers = new YAMLSection();
YAMLSection servers = new YAMLSection();
for (Server server : plugin.api.getServers().values()) {
if (this.server == null || this.server.length() <= 0 || this.server.equalsIgnoreCase(server.getName())) {
exServers.set(server.getName(), new YAMLSection(new Gson().fromJson(server.toString(), Map.class)));
servers.set(server.getName(), new YAMLSection(new Gson().fromJson(server.toString(), Map.class)));
}
}
data.set("servers", exServers);
data.set("servers", servers);
return data;
}

Expand Down
14 changes: 6 additions & 8 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
View file
Expand Up @@ -323,8 +323,6 @@ public void reload() throws IOException {
host.setDisplayName(config.get().getSection("Hosts").getSection(name).getString("Display"));
if (config.get().getSection("Hosts").getSection(name).getKeys().contains("Extra"))
for (String extra : config.get().getSection("Hosts").getSection(name).getSection("Extra").getKeys()) host.addExtra(extra, config.get().getSection("Hosts").getSection(name).getSection("Extra").getObject(extra));
if (host instanceof ClientHandler && ((ClientHandler) host).getSubData() != null)
((ClientHandler) host).getSubData().sendPacket(new PacketOutReload(null));
ukeys.add(name.toLowerCase());
hosts++;
} catch (Exception e) {
Expand Down Expand Up @@ -428,11 +426,8 @@ public void reload() throws IOException {

if (edits.getKeys().size() > 0) {
server.edit(edits);
if (server == api.getSubServer(name) && server.getSubData() != null)
server.getSubData().sendPacket(new PacketOutReload(null));
server = api.getSubServer(name);
} else if (server.getSubData() != null)
server.getSubData().sendPacket(new PacketOutReload(null));
}
} else { // Server cannot edit()
if (server == null || // Server must be reset
!config.get().getSection("Servers").getSection(name).getString("Host").equalsIgnoreCase(server.getHost().getName()) ||
Expand All @@ -458,8 +453,6 @@ public void reload() throws IOException {
server.setRestricted(config.get().getSection("Servers").getSection(name).getBoolean("Restricted"));
if (config.get().getSection("Servers").getSection(name).getBoolean("Hidden") != server.isHidden())
server.setHidden(config.get().getSection("Servers").getSection(name).getBoolean("Hidden"));
if (server.getSubData() != null)
server.getSubData().sendPacket(new PacketOutReload(null));
} // Apply these changes regardless of reset
if (config.get().getSection("Servers").getSection(name).getBoolean("Auto-Restart") != server.willAutoRestart())
server.setAutoRestart(config.get().getSection("Servers").getSection(name).getBoolean("Auto-Restart"));
Expand Down Expand Up @@ -519,6 +512,11 @@ public void reload() throws IOException {
}
}

if (status) {
for (Host host : api.getHosts().values()) if (host instanceof ClientHandler && ((ClientHandler) host).getSubData() != null) ((ClientHandler) host).getSubData().sendPacket(new PacketOutReload(null));
for (Server server : api.getServers().values()) if (server.getSubData() != null) server.getSubData().sendPacket(new PacketOutReload(null));
}

System.out.println("SubServers > " + ((plugins > 0)?plugins+" Plugin"+((plugins == 1)?"":"s")+", ":"") + ((proxies > 1)?proxies+" Proxies, ":"") + hosts + " Host"+((hosts == 1)?"":"s")+", " + servers + " Server"+((servers == 1)?"":"s")+", and " + subservers + " SubServer"+((subservers == 1)?"":"s")+" "+((status)?"re":"")+"loaded in " + new DecimalFormat("0.000").format((Calendar.getInstance().getTime().getTime() - begin) / 1000D) + "s");
}

Expand Down
4 changes: 2 additions & 2 deletions ...lient/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInRunEvent.java
View file
Expand Up @@ -46,7 +46,7 @@ public void run(YAMLSection data) {
@Override
public void run(YAMLSection data) {
if (plugin.isEnabled()) {
Bukkit.getPluginManager().callEvent(new SubAddServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, data.getString("host"), data.getString("server")));
Bukkit.getPluginManager().callEvent(new SubAddServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server")));
callback("SubAddServerEvent", this);
}
}
Expand Down Expand Up @@ -110,7 +110,7 @@ public void run(YAMLSection data) {
@Override
public void run(YAMLSection data) {
if (plugin.isEnabled()) {
Bukkit.getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, data.getString("host"), data.getString("server")));
Bukkit.getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server")));
callback("SubRemoveServerEvent", this);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...lient/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInRunEvent.java
View file
Expand Up @@ -41,7 +41,7 @@ public void run(YAMLSection data) {
callback("SubAddServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
Sponge.getEventManager().post(new SubAddServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, data.getString("host"), data.getString("server")));
Sponge.getEventManager().post(new SubAddServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server")));
callback("SubAddServerEvent", this);
}
});
Expand Down Expand Up @@ -91,7 +91,7 @@ public void run(YAMLSection data) {
callback("SubRemoveServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
Sponge.getEventManager().post(new SubRemoveServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, data.getString("host"), data.getString("server")));
Sponge.getEventManager().post(new SubRemoveServerEvent((data.contains("player")) ? UUID.fromString(data.getString("player")) : null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server")));
callback("SubRemoveServerEvent", this);
}
});
Expand Down
4 changes: 2 additions & 2 deletions SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInRunEvent.java
View file
Expand Up @@ -40,7 +40,7 @@ public void run(YAMLSection data) {
callback("SubAddServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
SubAPI.getInstance().executeEvent(new SubAddServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, data.getRawString("host"), data.getRawString("server")));
SubAPI.getInstance().executeEvent(new SubAddServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server")));
callback("SubAddServerEvent", this);
}
});
Expand Down Expand Up @@ -90,7 +90,7 @@ public void run(YAMLSection data) {
callback("SubRemoveServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
SubAPI.getInstance().executeEvent(new SubRemoveServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, data.getRawString("host"), data.getRawString("server")));
SubAPI.getInstance().executeEvent(new SubRemoveServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server")));
callback("SubRemoveServerEvent", this);
}
});
Expand Down
4 changes: 2 additions & 2 deletions SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInRunEvent.java
View file
Expand Up @@ -40,7 +40,7 @@ public void run(YAMLSection data) {
callback("SubAddServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
ProxyServer.getInstance().getPluginManager().callEvent(new SubAddServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, data.getRawString("host"), data.getRawString("server")));
ProxyServer.getInstance().getPluginManager().callEvent(new SubAddServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server")));
callback("SubAddServerEvent", this);
}
});
Expand Down Expand Up @@ -90,7 +90,7 @@ public void run(YAMLSection data) {
callback("SubRemoveServerEvent", new Callback<YAMLSection>() {
@Override
public void run(YAMLSection data) {
ProxyServer.getInstance().getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, data.getRawString("host"), data.getRawString("server")));
ProxyServer.getInstance().getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player"))?UUID.fromString(data.getRawString("player")):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server")));
callback("SubRemoveServerEvent", this);
}
});
Expand Down

0 comments on commit cb7b396

Please sign in to comment.