Skip to content

Do not apply fabric-api particle workaround when protocol versions match #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DrexHD wants to merge 1 commit into from
+8 −0
Closed

Do not apply fabric-api particle workaround when protocol versions match #487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/com/viaversion/fabric/common/protocol/ViaFabricProtocolBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

import com.google.common.collect.Lists;
import com.viaversion.fabric.common.AddressParser;
import com.viaversion.fabric.common.platform.NativeVersionProvider;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.api.type.Types;
import com.viaversion.viaversion.protocols.base.ServerboundHandshakePackets;
import com.viaversion.viaversion.util.Key;
Expand Down Expand Up @@ -54,9 +56,15 @@ protected void registerPackets() {
return;
}

final ProtocolVersion nativeServerVersion = Via.getManager().getProviders().get(NativeVersionProvider.class).getNativeServerProtocolVersion();

// Fixes an issue where the Fabric Particle API causes disconnects when both the client and server have the mod installed and both are 1.21.5+.
// See https://github.com/ViaVersion/ViaFabric/issues/428
registerServerbound(customPayload, wrapper -> {
// ViaVersion doesn't track the user state when the user uses the same version as the server.
final ProtocolVersion userVersion = wrapper.user().getProtocolInfo().protocolVersion();
if (nativeServerVersion.equalTo(userVersion)) return;

final String channel = Key.namespaced(wrapper.passthrough(Types.STRING));
if (channel.equals("minecraft:register") || channel.equals("minecraft:unregister")) {
final List<String> channels = Lists.newArrayList(new String(wrapper.passthrough(Types.SERVERBOUND_CUSTOM_PAYLOAD_DATA), StandardCharsets.UTF_8).split("\0"));
Expand Down