From 43b12ea5aa875829d8a5f43180708c492f35402a Mon Sep 17 00:00:00 2001 From: Salanto Date: Wed, 31 Mar 2021 19:16:34 +0200 Subject: [PATCH 1/2] Update packets.cpp The AO Client supports up to twelve colors by default. --- src/packets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packets.cpp b/src/packets.cpp index 80e89ce..6eb3438 100644 --- a/src/packets.cpp +++ b/src/packets.cpp @@ -486,7 +486,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet) // text color int text_color = incoming_args[14].toInt(); - if (text_color != 0 && text_color != 1 && text_color != 2 && text_color != 3 && text_color != 4 && text_color != 5 && text_color != 6) + if (text_color < 0 || text_color > 11) return invalid; args.append(QString::number(text_color)); From ca7fe9095842186760cdc315d421c555d2a6619b Mon Sep 17 00:00:00 2001 From: in1tiate Date: Thu, 1 Apr 2021 13:14:14 -0500 Subject: [PATCH 2/2] check the other client's pos against ours before pairing --- src/packets.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packets.cpp b/src/packets.cpp index 80e89ce..96a81dc 100644 --- a/src/packets.cpp +++ b/src/packets.cpp @@ -512,7 +512,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet) QString other_offset = "0"; QString other_flip = "0"; for (AOClient* client : server->clients) { - if (client->pairing_with == char_id && other_charid != char_id && client->char_id == pairing_with) { + if (client->pairing_with == char_id + && other_charid != char_id + && client->char_id == pairing_with + && client->pos == pos) { other_name = server->characters.at(other_charid); other_emote = client->emote; other_offset = client->offset;