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

Fix command UID crash

Browse Source 
Fix several commands targeting clients by UID crashing the server by not properly checking if the client they want exists.
This commit is contained in:
MangosArentLiterature 2021-05-31 20:50:46 -05:00
parent eb834a639d
commit 17ab971e85
4 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/commands/area.cpp
View File

@ -82,6 +82,10 @@ void AOClient::cmdUnCM(int argc, QStringList argv)
return;
}
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
target->sendServerMessage("You have been unCMed by a moderator.");
}
else {

44
core/src/commands/messaging.cpp
View File

@ -189,6 +189,11 @@ void AOClient::cmdGimp(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_gimped)
sendServerMessage("That player is already gimped!");
else {
@ -209,6 +214,11 @@ void AOClient::cmdUnGimp(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!(target->is_gimped))
sendServerMessage("That player is not gimped!");
else {
@ -229,6 +239,11 @@ void AOClient::cmdDisemvowel(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_disemvoweled)
sendServerMessage("That player is already disemvoweled!");
else {
@ -249,6 +264,11 @@ void AOClient::cmdUnDisemvowel(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!(target->is_disemvoweled))
sendServerMessage("That player is not disemvoweled!");
else {
@ -269,6 +289,11 @@ void AOClient::cmdShake(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_shaken)
sendServerMessage("That player is already shaken!");
else {
@ -289,6 +314,11 @@ void AOClient::cmdUnShake(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!(target->is_shaken))
sendServerMessage("That player is not shaken!");
else {
@ -329,6 +359,11 @@ void AOClient::cmdCharCurse(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_charcursed) {
sendServerMessage("That player is already charcursed!");
return;
@ -379,6 +414,11 @@ void AOClient::cmdUnCharCurse(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!target->is_charcursed) {
sendServerMessage("That player is not charcursed!");
return;
@ -408,6 +448,10 @@ void AOClient::cmdCharSelect(int argc, QStringList argv)
return;
AOClient* target = server->getClientByID(target_id);
if (target == nullptr)
return;
target->changeCharacter(-1);
target->sendPacket("DONE");
}

34
core/src/commands/moderation.cpp
View File

@ -215,6 +215,11 @@ void AOClient::cmdMute(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_muted)
sendServerMessage("That player is already muted!");
else {
@ -235,6 +240,11 @@ void AOClient::cmdUnMute(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!target->is_muted)
sendServerMessage("That player is not muted!");
else {
@ -255,6 +265,11 @@ void AOClient::cmdOocMute(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_ooc_muted)
sendServerMessage("That player is already OOC muted!");
else {
@ -275,6 +290,11 @@ void AOClient::cmdOocUnMute(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!target->is_ooc_muted)
sendServerMessage("That player is not OOC muted!");
else {
@ -295,6 +315,11 @@ void AOClient::cmdBlockWtce(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_wtce_blocked)
sendServerMessage("That player is already judge blocked!");
else {
@ -315,6 +340,11 @@ void AOClient::cmdUnBlockWtce(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!target->is_wtce_blocked)
sendServerMessage("That player is not judge blocked!");
else {
@ -429,6 +459,10 @@ void AOClient::cmdKickUid(int argc, QStringList argv)
}
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
target->sendPacket("KK", {reason});
target->socket->close();
sendServerMessage("Kicked client with UID " + argv[0] + " for reason: " + reason);

10
core/src/commands/music.cpp
View File

@ -54,6 +54,11 @@ void AOClient::cmdBlockDj(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (target->is_dj_blocked)
sendServerMessage("That player is already DJ blocked!");
else {
@ -74,6 +79,11 @@ void AOClient::cmdUnBlockDj(int argc, QStringList argv)
AOClient* target = server->getClientByID(uid);
if (target == nullptr) {
sendServerMessage("No client with that ID found.");
return;
}
if (!target->is_dj_blocked)
sendServerMessage("That player is not DJ blocked!");
else {