Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43 from AttorneyOnline/iniswap-pair

Browse Source 
Fix pairing while iniswapped
This commit is contained in:
scatterflower 2021-04-02 11:48:38 -05:00 committed by GitHub
commit 3ca57ff54a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/aoclient.h
View File

@ -123,6 +123,13 @@ class AOClient : public QObject {
*/ */
QString current_char; QString current_char;
/**
* @brief The internal name of the character the client is iniswapped to.
*
* @note This will be the same as current_char if the client is not iniswapped.
*/
QString current_iniswap;
/** /**
* @brief If true, the client is a logged-in moderator. * @brief If true, the client is a logged-in moderator.
*/ */

3
src/packets.cpp
View File

@ -404,6 +404,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
} }
qDebug() << "INI swap detected from " << getIpid(); qDebug() << "INI swap detected from " << getIpid();
} }
current_iniswap = incoming_args[2].toString();
args.append(incoming_args[2].toString()); args.append(incoming_args[2].toString());
// emote // emote
@ -516,7 +517,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
&& other_charid != char_id && other_charid != char_id
&& client->char_id == pairing_with && client->char_id == pairing_with
&& client->pos == pos) { && client->pos == pos) {
other_name = server->characters.at(other_charid); other_name = client->current_iniswap;
other_emote = client->emote; other_emote = client->emote;
other_offset = client->offset; other_offset = client->offset;
other_flip = client->flipping; other_flip = client->flipping;