Merge remote-tracking branch 'refs/remotes/scatter/master'
This commit is contained in:
commit
3aeff2d72d
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user