From 96a3cf797e1f74150ba1842335b54ca98197d66b Mon Sep 17 00:00:00 2001 From: ME1312 Date: Wed, 11 Nov 2020 16:07:22 -0500 Subject: [PATCH] Update SubData --- SubServers.Bungee/pom.xml | 2 +- .../SubServers/Bungee/Network/Packet/PacketExCreateServer.java | 2 +- .../SubServers/Bungee/Network/Packet/PacketUpdateServer.java | 2 +- SubServers.Client/Bukkit/pom.xml | 2 +- .../Client/Bukkit/Network/Packet/PacketUpdateServer.java | 2 +- .../src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java | 2 +- SubServers.Client/Sponge/pom.xml | 2 +- .../Client/Sponge/Network/Packet/PacketUpdateServer.java | 2 +- .../src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java | 2 +- SubServers.Host/pom.xml | 2 +- SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java | 2 +- .../net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java | 2 +- .../SubServers/Host/Network/Packet/PacketExCreateServer.java | 2 +- .../SubServers/Host/Network/Packet/PacketUpdateServer.java | 2 +- .../src/net/ME1312/SubServers/Host/Network/SubProtocol.java | 2 +- SubServers.Sync/pom.xml | 2 +- SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java | 2 +- .../SubServers/Sync/Network/Packet/PacketUpdateServer.java | 2 +- .../src/net/ME1312/SubServers/Sync/Network/SubProtocol.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index ede5a015..c1e418b7 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -43,7 +43,7 @@ net.ME1312.SubData Server - 20w42a + 20w46a compile true diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java index d6433f53..8994cd25 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java @@ -111,6 +111,6 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje @Override public int version() { - return 0x0002; + return 0x0001; } } \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketUpdateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketUpdateServer.java index c556c0b8..c0dc5a12 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketUpdateServer.java @@ -103,6 +103,6 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public int version() { - return 0x0002; + return 0x0001; } } diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 651232b5..527d3714 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -55,7 +55,7 @@ net.ME1312.SubData Client - 20w42a + 20w46a compile true diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java index 58b3f804..e80f9b23 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java @@ -85,6 +85,6 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public int version() { - return 0x0002; + return 0x0001; } } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 55c2b72a..f81deb4f 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -189,7 +189,7 @@ public final class SubPlugin extends JavaPlugin { } private void connect(NamedContainer disconnect) throws IOException { - int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30); + int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) { long reset = resetDate; if (disconnect != null) Bukkit.getLogger().info("SubData > Attempting reconnect in " + reconnect + " seconds"); diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 0d0be6aa..a887afed 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -37,7 +37,7 @@ net.ME1312.SubData Client - 20w42a + 20w46a compile true diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketUpdateServer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketUpdateServer.java index 28d8e49f..c5249db1 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketUpdateServer.java @@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public int version() { - return 0x0002; + return 0x0001; } } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java index 5b222e53..fe774b3a 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java @@ -203,7 +203,7 @@ public final class SubPlugin { } private void connect(NamedContainer disconnect) throws IOException { - int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30); + int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) { long reset = resetDate; Logger log = LoggerFactory.getLogger("SubData"); diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index a21a2b09..f8b9970d 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -27,7 +27,7 @@ net.ME1312.SubData Client - 20w42a + 20w46a compile true diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index ca3888c5..e2840008 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -275,7 +275,7 @@ public final class ExHost { } private void connect(java.util.logging.Logger log, NamedContainer disconnect) throws IOException { - int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30); + int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) { long reset = resetDate; Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index b4398bc5..3732f44f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -81,7 +81,7 @@ public class SubLoggerImpl { @Override public void run(NamedContainer client) { if (started && SubLoggerImpl.this.process != null && process == SubLoggerImpl.this.process && process.isAlive()) { - int reconnect = host.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30); + int reconnect = host.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("reconnect"), host), false) && reconnect > 0 && client.name() != DisconnectReason.PROTOCOL_MISMATCH && client.name() != DisconnectReason.ENCRYPTION_MISMATCH) { Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Log_Reconnect_Handler"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java index 86a96445..b784e52e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java @@ -104,6 +104,6 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje @Override public int version() { - return 0x0002; + return 0x0001; } } \ No newline at end of file diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketUpdateServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketUpdateServer.java index ece3a8be..b40fdcd8 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketUpdateServer.java @@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public int version() { - return 0x0002; + return 0x0001; } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java index e0f3f95a..759799cd 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java @@ -169,7 +169,7 @@ public class SubProtocol extends SubDataProtocol { if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) { Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null); - log.info("Attempting reconnect in " + host.config.get().getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getInt("Reconnect", 30) + " seconds"); + log.info("Attempting reconnect in " + host.config.get().getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getInt("Reconnect", 60) + " seconds"); Util.isException(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, NamedContainer.class), host, log, client)); } else map.put(0, null); }); diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index a626ba5d..4d0042ae 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -43,7 +43,7 @@ net.ME1312.SubData Client - 20w42a + 20w46a compile true diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index df2717b0..4f98c8e6 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -180,7 +180,7 @@ public final class ExProxy extends BungeeCord implements Listener { } private void connect(NamedContainer disconnect) throws IOException { - int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30); + int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) { long reset = resetDate; Timer timer = new Timer("SubServers.Sync::SubData_Reconnect_Handler"); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketUpdateServer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketUpdateServer.java index a9e384ef..6e5ead67 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketUpdateServer.java @@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public int version() { - return 0x0002; + return 0x0001; } } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java index b4280eec..730661eb 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java @@ -199,7 +199,7 @@ public class SubProtocol extends SubDataProtocol { plugin.getPluginManager().callEvent(event); if (plugin.isRunning) { - net.ME1312.SubServers.Sync.Library.Compatibility.Logger.get("SubData").info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 30) + " seconds"); + net.ME1312.SubServers.Sync.Library.Compatibility.Logger.get("SubData").info("Attempting reconnect in " + plugin.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60) + " seconds"); Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client)); } else map.put(0, null); });