Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-26 04:05:57 +01:00
Code Issues Projects Releases Wiki Activity

Update SubData

Browse Source
This commit is contained in:
ME1312 2020-11-11 16:07:22 -05:00
parent c62363bdef
commit 96a3cf797e
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/pom.xml
View File

@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Server</artifactId> <artifactId>Server</artifactId>
<version>20w42a</version> <version>20w46a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java
View File

@ -111,6 +111,6 @@ public class PacketExCreateServer implements PacketObjectIn<Integer>, PacketObje
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketUpdateServer.java
View File

@ -103,6 +103,6 @@ public class PacketUpdateServer implements PacketObjectIn<Integer>, PacketObject
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Client/Bukkit/pom.xml
View File

@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>20w42a</version> <version>20w46a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java
View File

@ -85,6 +85,6 @@ public class PacketUpdateServer implements PacketObjectIn<Integer>, PacketObject
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View File

@ -189,7 +189,7 @@ public final class SubPlugin extends JavaPlugin {
} }
private void connect(NamedContainer<DisconnectReason, DataClient> disconnect) throws IOException { private void connect(NamedContainer<DisconnectReason, DataClient> 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)) { if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) {
long reset = resetDate; long reset = resetDate;
if (disconnect != null) Bukkit.getLogger().info("SubData > Attempting reconnect in " + reconnect + " seconds"); if (disconnect != null) Bukkit.getLogger().info("SubData > Attempting reconnect in " + reconnect + " seconds");

2
SubServers.Client/Sponge/pom.xml
View File

@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>20w42a</version> <version>20w46a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketUpdateServer.java
View File

@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn<Integer>, PacketObject
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java
View File

@ -203,7 +203,7 @@ public final class SubPlugin {
} }
private void connect(NamedContainer<DisconnectReason, DataClient> disconnect) throws IOException { private void connect(NamedContainer<DisconnectReason, DataClient> 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)) { if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) {
long reset = resetDate; long reset = resetDate;
Logger log = LoggerFactory.getLogger("SubData"); Logger log = LoggerFactory.getLogger("SubData");

2
SubServers.Host/pom.xml
View File

@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>20w42a</version> <version>20w46a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
View File

@ -275,7 +275,7 @@ public final class ExHost {
} }
private void connect(java.util.logging.Logger log, NamedContainer<DisconnectReason, DataClient> disconnect) throws IOException { private void connect(java.util.logging.Logger log, NamedContainer<DisconnectReason, DataClient> 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)) { if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) {
long reset = resetDate; long reset = resetDate;
Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler"); Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler");

2
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java
View File

@ -81,7 +81,7 @@ public class SubLoggerImpl {
@Override @Override
public void run(NamedContainer<DisconnectReason, DataClient> client) { public void run(NamedContainer<DisconnectReason, DataClient> client) {
if (started && SubLoggerImpl.this.process != null && process == SubLoggerImpl.this.process && process.isAlive()) { 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 if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("reconnect"), host), false) && reconnect > 0
&& client.name() != DisconnectReason.PROTOCOL_MISMATCH && client.name() != DisconnectReason.ENCRYPTION_MISMATCH) { && client.name() != DisconnectReason.PROTOCOL_MISMATCH && client.name() != DisconnectReason.ENCRYPTION_MISMATCH) {
Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Log_Reconnect_Handler"); Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Log_Reconnect_Handler");

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java
View File

@ -104,6 +104,6 @@ public class PacketExCreateServer implements PacketObjectIn<Integer>, PacketObje
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketUpdateServer.java
View File

@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn<Integer>, PacketObject
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java
View File

@ -169,7 +169,7 @@ public class SubProtocol extends SubDataProtocol {
if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) { if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) {
Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.get()), null); 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)); Util.isException(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, NamedContainer.class), host, log, client));
} else map.put(0, null); } else map.put(0, null);
}); });

2
SubServers.Sync/pom.xml
View File

@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>net.ME1312.SubData</groupId> <groupId>net.ME1312.SubData</groupId>
<artifactId>Client</artifactId> <artifactId>Client</artifactId>
<version>20w42a</version> <version>20w46a</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
View File

@ -180,7 +180,7 @@ public final class ExProxy extends BungeeCord implements Listener {
} }
private void connect(NamedContainer<DisconnectReason, DataClient> disconnect) throws IOException { private void connect(NamedContainer<DisconnectReason, DataClient> 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)) { if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.name() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.name() != DisconnectReason.ENCRYPTION_MISMATCH)) {
long reset = resetDate; long reset = resetDate;
Timer timer = new Timer("SubServers.Sync::SubData_Reconnect_Handler"); Timer timer = new Timer("SubServers.Sync::SubData_Reconnect_Handler");

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketUpdateServer.java
View File

@ -84,6 +84,6 @@ public class PacketUpdateServer implements PacketObjectIn<Integer>, PacketObject
@Override @Override
public int version() { public int version() {
return 0x0002; return 0x0001;
} }
} }

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java
View File

@ -199,7 +199,7 @@ public class SubProtocol extends SubDataProtocol {
plugin.getPluginManager().callEvent(event); plugin.getPluginManager().callEvent(event);
if (plugin.isRunning) { 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)); Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", NamedContainer.class), plugin, client));
} else map.put(0, null); } else map.put(0, null);
}); });