Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-09-29 04:27:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle errors properly in <=1.20 custom payload handling

Browse Source
This commit is contained in:
RaphiMC 2024-04-04 00:23:41 +02:00
parent 84f780edec
commit 43daa63246
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/raphimc/viaproxy/proxy/packethandler/BrandCustomPayloadPacketHandler.java
View File

@ -17,6 +17,7 @@
*/
package net.raphimc.viaproxy.proxy.packethandler;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.util.Key;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
@ -54,7 +55,17 @@ public class BrandCustomPayloadPacketHandler extends PacketHandler {
final ByteBuf data = Unpooled.wrappedBuffer(unknownPacket.data);
final String channel = PacketTypes.readString(data, Short.MAX_VALUE); // channel
if (Key.namespaced(channel).equals(BRAND_CHANNEL) || channel.equals(LEGACY_BRAND_CHANNEL)) {
final String brand = PacketTypes.readString(data, Short.MAX_VALUE);
String brand;
try {
brand = PacketTypes.readString(data, Short.MAX_VALUE);
} catch (Exception e) {
if (this.proxyConnection.getServerVersion().newerThan(ProtocolVersion.v1_20)) {
throw e;
} else { // <=1.20 clients ignore errors
brand = "Unknown";
}
}
final String newBrand = "ViaProxy (" + this.proxyConnection.getClientVersion().getName() + ") -> " + brand + " §r(" + this.proxyConnection.getServerVersion().getName() + ")";
final ByteBuf newCustomPayloadData = Unpooled.buffer();