open-autonomous-connection/Protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
Finn
2026-01-19 14:21:46 +01:00
parent b244633131
commit 9958306572
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.openautonomousconnection</groupId>
<artifactId>Protocol</artifactId>
<version>1.0.0-BETA.6.0</version>
<version>1.0.0-BETA.6.1</version>
<organization>
<name>Open Autonomous Connection</name>
<url>https://open-autonomous-connection.org/</url>

1
src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java
View File

@@ -3,7 +3,6 @@ package org.openautonomousconnection.protocol.listeners;
import dev.unlegitdqrk.unlegitlibrary.event.EventListener;
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.disconnect.ClientDisconnectedEvent;
import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.state.disconnect.ClientFullyDisconnectedEvent;
import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport;
import lombok.Getter;

2
src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java
View File

@@ -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()));
} catch (Exception ignored) {
protocolBridge.getProtocolClient().setServerVersion(serverVersion);

29
src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java
View File

@@ -1,7 +1,6 @@
package org.openautonomousconnection.protocol.side.client;
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.utils.Transport;
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.
*/
private ProtocolVersion insServerVersion = null;
private ProtocolVersion insVersion = null;
/**
* 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.
*/
public final ProtocolVersion getInsServerVersion() {
return insServerVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : insServerVersion;
public final ProtocolVersion getInsVersion() {
return insVersion == null ? ProtocolVersion.PV_1_0_0_CLASSIC : insVersion;
}
/**
* 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) {
if (insServerVersion == null) this.insServerVersion = insServerVersion;
public final void setInsVersion(ProtocolVersion insVersion) {
if (insVersion == null) this.insVersion = insVersion;
}
/**
@@ -242,7 +241,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
public final void onDisconnect(ClientFullyDisconnectedEvent event) {
// Reset server version on INS disconnect
if (!clientToINS.isFullyConnected() && clientToINS != null) {
insServerVersion = null;
insVersion = null;
clientToINS = null;
disconnectFromServer();
}
@@ -287,7 +286,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
*/
public final boolean isINSBetaServer() {
// 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() {
boolean yes = false;
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
// Check if compatible version is beta
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.BETA;
if (yes) break;
@@ -314,7 +313,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
*/
public final boolean isINSClassicServer() {
// 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() {
boolean yes = false;
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
// Check if compatible version is classic
yes = compatibleVersion.getProtocolType() == ProtocolVersion.ProtocolType.CLASSIC;
if (yes) break;
@@ -353,7 +352,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
*/
public final boolean supportINSServerVersion(ProtocolVersion targetVersion) {
// 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) {
boolean yes = false;
for (ProtocolVersion compatibleVersion : getInsServerVersion().getCompatibleVersions()) {
for (ProtocolVersion compatibleVersion : getInsVersion().getCompatibleVersions()) {
// Check if compatible version supports the protocol
yes = compatibleVersion.getSupportedProtocols().contains(protocol);
if (yes) break;
}
// Check if the server version supports the protocol
return getInsServerVersion().getSupportedProtocols().contains(protocol) || yes;
return getInsVersion().getSupportedProtocols().contains(protocol) || yes;
}
//fwfwef

2
src/main/java/org/openautonomousconnection/protocol/side/server/CustomConnectedClient.java
View File

@@ -32,6 +32,8 @@ public abstract class CustomConnectedClient {
connection.disconnect();
} catch (Exception ignored) {
}
clientVersion = null;
}