Bug fix
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>org.openautonomousconnection</groupId>
|
<groupId>org.openautonomousconnection</groupId>
|
||||||
<artifactId>Protocol</artifactId>
|
<artifactId>Protocol</artifactId>
|
||||||
<version>1.0.0-BETA.6.0</version>
|
<version>1.0.0-BETA.6.1</version>
|
||||||
<organization>
|
<organization>
|
||||||
<name>Open Autonomous Connection</name>
|
<name>Open Autonomous Connection</name>
|
||||||
<url>https://open-autonomous-connection.org/</url>
|
<url>https://open-autonomous-connection.org/</url>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package org.openautonomousconnection.protocol.listeners;
|
|||||||
import dev.unlegitdqrk.unlegitlibrary.event.EventListener;
|
import dev.unlegitdqrk.unlegitlibrary.event.EventListener;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.event.Listener;
|
import dev.unlegitdqrk.unlegitlibrary.event.Listener;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.connect.ClientConnectedEvent;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.connect.ClientConnectedEvent;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientDisconnectedEvent;
|
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientFullyDisconnectedEvent;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientFullyDisconnectedEvent;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public final class AuthPacket extends OACPacket {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protocolBridge.getProtocolClient().setInsServerVersion(serverVersion);
|
protocolBridge.getProtocolClient().setInsVersion(serverVersion);
|
||||||
protocolBridge.getProtocolValues().eventManager.executeEvent(new ConnectedToProtocolINSServerEvent(protocolBridge.getProtocolClient()));
|
protocolBridge.getProtocolValues().eventManager.executeEvent(new ConnectedToProtocolINSServerEvent(protocolBridge.getProtocolClient()));
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
protocolBridge.getProtocolClient().setServerVersion(serverVersion);
|
protocolBridge.getProtocolClient().setServerVersion(serverVersion);
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package org.openautonomousconnection.protocol.side.client;
|
package org.openautonomousconnection.protocol.side.client;
|
||||||
|
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.NetworkClient;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.client.NetworkClient;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientDisconnectedEvent;
|
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientFullyDisconnectedEvent;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientFullyDisconnectedEvent;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport;
|
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport;
|
||||||
import dev.unlegitdqrk.unlegitlibrary.network.utils.NetworkUtils;
|
import dev.unlegitdqrk.unlegitlibrary.network.utils.NetworkUtils;
|
||||||
@@ -48,7 +47,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
/**
|
/**
|
||||||
* Stores the protocol version of the connected insserver.
|
* Stores the protocol version of the connected insserver.
|
||||||
*/
|
*/
|
||||||
private ProtocolVersion insServerVersion = null;
|
private ProtocolVersion insVersion = null;
|
||||||
/**
|
/**
|
||||||
* Stores the protocol version of the connected server.
|
* Stores the protocol version of the connected server.
|
||||||
*/
|
*/
|
||||||
@@ -221,17 +220,17 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*
|
*
|
||||||
* @return the ProtocolVersion of the server, or PV_1_0_0_CLASSIC if not set.
|
* @return the ProtocolVersion of the server, or PV_1_0_0_CLASSIC if not set.
|
||||||
*/
|
*/
|
||||||
public final ProtocolVersion getInsServerVersion() {
|
public final ProtocolVersion getInsVersion() {
|
||||||
return insServerVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : insServerVersion;
|
return insVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : insVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the protocol version of the connected server.
|
* Sets the protocol version of the connected server.
|
||||||
*
|
*
|
||||||
* @param insServerVersion the ProtocolVersion to set for the server.
|
* @param insVersion the ProtocolVersion to set for the server.
|
||||||
*/
|
*/
|
||||||
public final void setInsServerVersion(ProtocolVersion insServerVersion) {
|
public final void setInsVersion(ProtocolVersion insVersion) {
|
||||||
if (insServerVersion == null) this.insServerVersion = insServerVersion;
|
if (insVersion == null) this.insVersion = insVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -242,7 +241,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
public final void onDisconnect(ClientFullyDisconnectedEvent event) {
|
public final void onDisconnect(ClientFullyDisconnectedEvent event) {
|
||||||
// Reset server version on INS disconnect
|
// Reset server version on INS disconnect
|
||||||
if (!clientToINS.isFullyConnected() && clientToINS != null) {
|
if (!clientToINS.isFullyConnected() && clientToINS != null) {
|
||||||
insServerVersion = null;
|
insVersion = null;
|
||||||
clientToINS = null;
|
clientToINS = null;
|
||||||
disconnectFromServer();
|
disconnectFromServer();
|
||||||
}
|
}
|
||||||
@@ -287,7 +286,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean isINSBetaServer() {
|
public final boolean isINSBetaServer() {
|
||||||
// Check if the server version is beta
|
// Check if the server version is beta
|
||||||
return getInsServerVersion().getProtocolType() == ProtocolVersion.ProtocolType.BETA;
|
return getInsVersion().getProtocolType() == ProtocolVersion.ProtocolType.BETA;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -297,7 +296,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean supportINSServerBeta() {
|
public final boolean supportINSServerBeta() {
|
||||||
boolean yes = false;
|
boolean yes = false;
|
||||||
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
|
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
|
||||||
// Check if compatible version is beta
|
// Check if compatible version is beta
|
||||||
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.BETA;
|
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.BETA;
|
||||||
if (yes) break;
|
if (yes) break;
|
||||||
@@ -314,7 +313,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean isINSClassicServer() {
|
public final boolean isINSClassicServer() {
|
||||||
// Check if the server version is classic
|
// Check if the server version is classic
|
||||||
return getInsServerVersion().getProtocolType() == ProtocolVersion.ProtocolType.CLASSIC;
|
return getInsVersion().getProtocolType() == ProtocolVersion.ProtocolType.CLASSIC;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -324,7 +323,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean supportINSServerClassic() {
|
public final boolean supportINSServerClassic() {
|
||||||
boolean yes = false;
|
boolean yes = false;
|
||||||
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
|
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
|
||||||
// Check if compatible version is classic
|
// Check if compatible version is classic
|
||||||
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.CLASSIC;
|
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.CLASSIC;
|
||||||
if (yes) break;
|
if (yes) break;
|
||||||
@@ -353,7 +352,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean supportINSServerVersion(ProtocolVersion targetVersion) {
|
public final boolean supportINSServerVersion(ProtocolVersion targetVersion) {
|
||||||
// Directly check if the server version matches or is in the list of compatible versions
|
// Directly check if the server version matches or is in the list of compatible versions
|
||||||
return getInsServerVersion() == targetVersion || getInsServerVersion().getCompatibleVersions().contains(targetVersion);
|
return getInsVersion() == targetVersion || getInsVersion().getCompatibleVersions().contains(targetVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -364,14 +363,14 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
|
|||||||
*/
|
*/
|
||||||
public final boolean supportINSServerProtocol(ProtocolVersion.Protocol protocol) {
|
public final boolean supportINSServerProtocol(ProtocolVersion.Protocol protocol) {
|
||||||
boolean yes = false;
|
boolean yes = false;
|
||||||
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
|
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
|
||||||
// Check if compatible version supports the protocol
|
// Check if compatible version supports the protocol
|
||||||
yes = compatibleVersion.getSupportedProtocols().contains(protocol);
|
yes = compatibleVersion.getSupportedProtocols().contains(protocol);
|
||||||
if (yes) break;
|
if (yes) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the server version supports the protocol
|
// Check if the server version supports the protocol
|
||||||
return getInsServerVersion().getSupportedProtocols().contains(protocol) || yes;
|
return getInsVersion().getSupportedProtocols().contains(protocol) || yes;
|
||||||
}
|
}
|
||||||
|
|
||||||
//fwfwef
|
//fwfwef
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ public abstract class CustomConnectedClient {
|
|||||||
connection.disconnect();
|
connection.disconnect();
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clientVersion = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user