Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-11-15 10:35:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server blocking with multiconnect

Browse Source
This commit is contained in:
creeper123123321 2020-07-06 12:12:09 -03:00
parent 77fc8bd16b
commit 76a22655cc
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -57,7 +57,7 @@ Adding [ViaBackwards](https://viaversion.com/backwards) (and optionally [ViaRewi
**How can I disable client-side ViaFabric?:**
-You can disable it by resetting the anti-cheat warning in config file or by setting protocol version to -1
- You can disable it by resetting the anti-cheat warning in config file or by setting protocol version to -1
**Does it work with multiconnect at same time on client?:**

4
src/main/java/com/github/creeper123123321/viafabric/mixin/client/MixinDebugHud.java
View File

@ -45,7 +45,7 @@ public class MixinDebugHud {
protected void getLeftText(CallbackInfoReturnable<List<String>> info) {
info.getReturnValue().add("[ViaFabric] Injected: " + Via.getManager().getConnections().size() + " ("
+ Via.getManager().getConnectedClients().size() + " frontend)");
ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler()
@SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler()
.getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
if (viaDecoder instanceof VRDecodeHandler) {
ProtocolInfo protocol = ((VRDecodeHandler) viaDecoder).getInfo().getProtocolInfo();
@ -58,7 +58,7 @@ public class MixinDebugHud {
}
info.getReturnValue().add("[ViaFabric] Client injected: C: " +
clientVer.getName() + " (" + clientVer.getId() + ") S: " +
serverVer.getName() + "(" + serverVer.getId() + ")" + inactive);
serverVer.getName() + " (" + serverVer.getId() + ")" + inactive);
}
}
}

15
src/main/java/com/github/creeper123123321/viafabric/providers/VRVersionProvider.java
View File

@ -30,6 +30,7 @@ import com.google.common.primitives.Ints;
import net.minecraft.network.ClientConnection;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
import us.myles.ViaVersion.api.protocol.ProtocolVersion;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.exception.CancelException;
@ -70,31 +71,33 @@ public class VRVersionProvider extends VersionProvider {
public int getServerProtocol(UserConnection connection) throws Exception {
if (connection instanceof VRClientSideUserConnection) {
int clientSideVersion = ViaFabric.config.getClientSideVersion();
boolean blocked = false;
if (connection.getChannel() != null) {
ProtocolInfo info = connection.getProtocolInfo();
ProtocolInfo info = Objects.requireNonNull(connection.getProtocolInfo());
SocketAddress addr = connection.getChannel().remoteAddress();
if (addr instanceof InetSocketAddress && (isDisabled(((InetSocketAddress) addr).getHostString())
|| ((((InetSocketAddress) addr).getAddress() != null) &&
(isDisabled(((InetSocketAddress) addr).getAddress().getHostAddress())
|| isDisabled(((InetSocketAddress) addr).getAddress().getHostName()))))) {
return -1;
blocked = true;
}
if (info != null
&& info.getState() == State.STATUS
&& info.getProtocolVersion() == -1
if (info.getState() == State.STATUS && info.getProtocolVersion() == -1
&& clientSideVersion != -1
&& connection.getChannel().pipeline().get(ClientConnection.class).getPacketListener()
.getClass().getName().startsWith("net.earthcomputer.multiconnect")) { // multiconnect version detector
int multiconnectSuggestion = getVersionForMulticonnect(clientSideVersion);
if (blocked) multiconnectSuggestion = -1;
ViaFabric.JLOGGER.info("Sending " + ProtocolVersion.getProtocol(multiconnectSuggestion) + " for multiconnect version detector");
PacketWrapper newAnswer = new PacketWrapper(0x00, null, connection);
newAnswer.write(Type.STRING, "{\"version\":{\"name\":\"viafabric integration\",\"protocol\":" + multiconnectSuggestion + "}}");
newAnswer.send(info.getPipeline().contains(BaseProtocol1_16.class) ? BaseProtocol1_16.class : BaseProtocol1_7.class);
throw CancelException.generate();
}
if (blocked) return info.getProtocolVersion();
}
if (clientSideVersion == -1) clientSideVersion = ProtocolRegistry.SERVER_PROTOCOL;
return clientSideVersion;
}
return super.getServerProtocol(connection);
@ -103,7 +106,7 @@ public class VRVersionProvider extends VersionProvider {
private int getVersionForMulticonnect(int clientSideVersion) {
// https://github.com/ViaVersion/ViaVersion/blob/master/velocity/src/main/java/us/myles/ViaVersion/velocity/providers/VelocityVersionProvider.java
// multiconnect supports it
int[] compatibleProtocols = multiconnectSupportedVersions.stream().mapToInt(it -> it).toArray();
int[] compatibleProtocols = multiconnectSupportedVersions.stream().mapToInt(Integer::intValue).toArray();
if (Arrays.binarySearch(compatibleProtocols, clientSideVersion) >= 0)
return clientSideVersion;