Merge remote-tracking branch 'refs/remotes/scatter/master'

This commit is contained in:
Cerapter 2021-04-26 21:23:51 +02:00
commit 3aeff2d72d
2 changed files with 4 additions and 0 deletions

View File

@ -25,6 +25,9 @@ AOPacket::AOPacket(QString p_header, QStringList p_contents)
AOPacket::AOPacket(QString p_packet)
{
if (p_packet.isEmpty())
return;
QStringList packet_contents = p_packet.split("#");
if (p_packet.at(0) == '#') {
// The header is encrypted with FantaCrypt

View File

@ -291,6 +291,7 @@ void AOClient::cmdStatus(int argc, QStringList argv)
return;
}
arup(ARUPType::STATUS, true);
sendServerMessageArea(ooc_name + " changed status to " + arg);
}
void AOClient::cmdJudgeLog(int argc, QStringList argv)