Parker2991/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-14 19:15:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added intended protocol state to PreConnectEvent
Some checks are pending
build-docker / build (push) Waiting to run
Details
build / build (push) Waiting to run
Details

Browse source
This commit is contained in:
RaphiMC 2024-10-06 19:30:06 +02:00
parent af9ff84fbb
commit a0f35c8ae0
No known key found for this signature in database
GPG key ID: 0F6BB0657A03AC94
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/raphimc/viaproxy/plugins/events/PreConnectEvent.java
View file

@ -20,6 +20,7 @@ package net.raphimc.viaproxy.plugins.events;
import com.google.common.net.HostAndPort; import com.google.common.net.HostAndPort;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import net.raphimc.netminecraft.constants.IntendedState;
import net.raphimc.viaproxy.plugins.events.types.EventCancellable; import net.raphimc.viaproxy.plugins.events.types.EventCancellable;
import java.net.SocketAddress; import java.net.SocketAddress;
@ -30,15 +31,17 @@ public class PreConnectEvent extends EventCancellable {
private ProtocolVersion serverVersion; private ProtocolVersion serverVersion;
private final ProtocolVersion clientVersion; private final ProtocolVersion clientVersion;
private final HostAndPort clientHandshakeAddress; private final HostAndPort clientHandshakeAddress;
private final IntendedState intendedState;
private final Channel clientChannel; private final Channel clientChannel;
private String cancelMessage = "§cCould not connect to the backend server! (Server is blacklisted)"; private String cancelMessage = "§cCould not connect to the backend server! (Server is blacklisted)";
public PreConnectEvent(final SocketAddress serverAddress, final ProtocolVersion serverVersion, final ProtocolVersion clientVersion, final HostAndPort clientHandshakeAddress, final Channel clientChannel) { public PreConnectEvent(final SocketAddress serverAddress, final ProtocolVersion serverVersion, final ProtocolVersion clientVersion, final HostAndPort clientHandshakeAddress, final IntendedState intendedState, final Channel clientChannel) {
this.serverAddress = serverAddress; this.serverAddress = serverAddress;
this.serverVersion = serverVersion; this.serverVersion = serverVersion;
this.clientVersion = clientVersion; this.clientVersion = clientVersion;
this.clientHandshakeAddress = clientHandshakeAddress; this.clientHandshakeAddress = clientHandshakeAddress;
this.intendedState = intendedState;
this.clientChannel = clientChannel; this.clientChannel = clientChannel;
} }
@ -66,6 +69,10 @@ public class PreConnectEvent extends EventCancellable {
return this.clientHandshakeAddress; return this.clientHandshakeAddress;
} }
public IntendedState getIntendedState() {
return this.intendedState;
}
public Channel getClientChannel() { public Channel getClientChannel() {
return this.clientChannel; return this.clientChannel;
} }

2
src/main/java/net/raphimc/viaproxy/proxy/client2proxy/Client2ProxyHandler.java
View file

@ -186,7 +186,7 @@ public class Client2ProxyHandler extends SimpleChannelInboundHandler<Packet> {
clientHandshakeAddress = null; clientHandshakeAddress = null;
} }
final PreConnectEvent preConnectEvent = new PreConnectEvent(serverAddress, serverVersion, clientVersion, clientHandshakeAddress, this.proxyConnection.getC2P()); final PreConnectEvent preConnectEvent = new PreConnectEvent(serverAddress, serverVersion, clientVersion, clientHandshakeAddress, packet.intendedState, this.proxyConnection.getC2P());
if (ViaProxy.EVENT_MANAGER.call(preConnectEvent).isCancelled()) { if (ViaProxy.EVENT_MANAGER.call(preConnectEvent).isCancelled()) {
this.proxyConnection.kickClient(preConnectEvent.getCancelMessage()); this.proxyConnection.kickClient(preConnectEvent.getCancelMessage());
} }