From 995830657230b0d461e7ef9583c6045e488de788 Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 19 Jan 2026 14:21:46 +0100 Subject: [PATCH] Bug fix --- pom.xml | 2 +- .../protocol/listeners/ClientListener.java | 1 - .../packets/v1_0_0/beta/AuthPacket.java | 2 +- .../protocol/side/client/ProtocolClient.java | 29 +++++++++---------- .../side/server/CustomConnectedClient.java | 2 ++ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index d8df5f4..713c269 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.openautonomousconnection Protocol - 1.0.0-BETA.6.0 + 1.0.0-BETA.6.1 Open Autonomous Connection https://open-autonomous-connection.org/ diff --git a/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java b/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java index eaf2b49..3c70f4b 100644 --- a/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java +++ b/src/main/java/org/openautonomousconnection/protocol/listeners/ClientListener.java @@ -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; diff --git a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java b/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java index e5705f6..aa30b99 100644 --- a/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java +++ b/src/main/java/org/openautonomousconnection/protocol/packets/v1_0_0/beta/AuthPacket.java @@ -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); diff --git a/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java b/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java index ccfc570..ca0a374 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java +++ b/src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java @@ -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 diff --git a/src/main/java/org/openautonomousconnection/protocol/side/server/CustomConnectedClient.java b/src/main/java/org/openautonomousconnection/protocol/side/server/CustomConnectedClient.java index 1eeebbf..c6dbc5d 100644 --- a/src/main/java/org/openautonomousconnection/protocol/side/server/CustomConnectedClient.java +++ b/src/main/java/org/openautonomousconnection/protocol/side/server/CustomConnectedClient.java @@ -32,6 +32,8 @@ public abstract class CustomConnectedClient { connection.disconnect(); } catch (Exception ignored) { } + + clientVersion = null; }