This commit is contained in:
ayunami2000 2023-10-07 20:00:30 -04:00
parent cc2eca5bbb
commit 6cc8a79c8b

View File

@ -284,12 +284,12 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
ctx.channel().writeAndFlush(new BinaryWebSocketFrame(data.readerIndex(0).retain())); ctx.channel().writeAndFlush(new BinaryWebSocketFrame(data.readerIndex(0).retain()));
break; break;
} }
if (!ctx.channel().hasAttr(Main.secureWs)) { if (!ctx.channel().hasAttr(Main.secureWs) || ctx.channel().attr(Main.secureWs) == null) {
if (packetId == ServerboundPackets1_5_2.PLUGIN_MESSAGE.getId() && Types1_6_4.STRING.read(data).startsWith("EAG|")) { if (packetId == ServerboundPackets1_5_2.PLUGIN_MESSAGE.getId() && Types1_6_4.STRING.read(data).startsWith("EAG|")) {
break; break;
} }
} }
} else if (this.version.isNewerThanOrEqualTo(VersionEnum.r1_7_2tor1_7_5) && !ctx.channel().hasAttr(Main.secureWs)) { } else if (this.version.isNewerThanOrEqualTo(VersionEnum.r1_7_2tor1_7_5) && (!ctx.channel().hasAttr(Main.secureWs) || ctx.channel().attr(Main.secureWs) == null)) {
final int packetId = PacketTypes.readVarInt(data); final int packetId = PacketTypes.readVarInt(data);
if (packetId == this.pluginMessageId && PacketTypes.readString(data, 32767).startsWith("EAG|")) { if (packetId == this.pluginMessageId && PacketTypes.readString(data, 32767).startsWith("EAG|")) {
break; break;