Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-16 19:51:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix block protocols disconnect packet

Browse Source
This commit is contained in:
Nassim Jahnke 2024-04-27 12:13:09 +02:00
parent 7ec6888a30
commit 66e0453398
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol1_7.java
View File

@ -23,6 +23,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.AbstractProtocol;
import com.viaversion.viaversion.api.protocol.ProtocolPathEntry; import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@ -158,20 +159,22 @@ public class BaseProtocol1_7 extends AbstractProtocol<BaseClientboundPacket, Bas
// Login Start Packet // Login Start Packet
registerServerbound(ServerboundLoginPackets.HELLO, wrapper -> { registerServerbound(ServerboundLoginPackets.HELLO, wrapper -> {
ProtocolVersion protocol = wrapper.user().getProtocolInfo().protocolVersion(); final UserConnection user = wrapper.user();
final ProtocolVersion protocol = user.getProtocolInfo().protocolVersion();
if (Via.getConfig().blockedProtocolVersions().contains(protocol)) { if (Via.getConfig().blockedProtocolVersions().contains(protocol)) {
if (!wrapper.user().getChannel().isOpen()) return; if (!user.getChannel().isOpen() || !user.shouldApplyBlockProtocol()) {
if (!wrapper.user().shouldApplyBlockProtocol()) return; return;
}
final String disconnectMessage = ChatColorUtil.translateAlternateColorCodes(Via.getConfig().getBlockedDisconnectMsg());
PacketWrapper disconnectPacket = PacketWrapper.create(ClientboundLoginPackets.LOGIN_DISCONNECT, wrapper.user()); // Disconnect Packet
wrapper.write(Type.COMPONENT, ComponentUtil.plainToJson(disconnectMessage));
wrapper.cancel(); // cancel current wrapper.cancel(); // cancel current
final String disconnectMessage = ChatColorUtil.translateAlternateColorCodes(Via.getConfig().getBlockedDisconnectMsg());
final PacketWrapper disconnectPacket = PacketWrapper.create(ClientboundLoginPackets.LOGIN_DISCONNECT, user);
disconnectPacket.write(Type.COMPONENT, ComponentUtil.plainToJson(disconnectMessage));
// Send and close // Send and close
ChannelFuture future = disconnectPacket.sendFuture(null); final ChannelFuture future = disconnectPacket.sendFuture(null);
future.addListener(f -> wrapper.user().getChannel().close()); future.addListener(f -> user.getChannel().close());
} }
}); });