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

fix a few small bugs

Browse Source
This commit is contained in:
scatterflower 2021-04-18 19:18:52 -05:00
parent 08ba6ef278
commit 4f6706ae94
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/commands/messaging.cpp
View File

@ -327,7 +327,7 @@ void AOClient::cmdCharCurse(int argc, QStringList argv)
return; return;
} }
AOClient* target = server->getClientByID(uid); AOClient* target = server->getClientByID(uid);
if (target->is_charcursed) { if (target->is_charcursed) {
sendServerMessage("That player is already charcursed!"); sendServerMessage("That player is already charcursed!");
@ -337,29 +337,31 @@ void AOClient::cmdCharCurse(int argc, QStringList argv)
if (argc == 1) { if (argc == 1) {
target->charcurse_list.append(server->getCharID(current_char)); target->charcurse_list.append(server->getCharID(current_char));
} }
else { else {
argv.removeFirst(); //remove the UID argv.removeFirst(); //remove the UID
QString names = argv.join(" ");
argv = names.split(", ");
QString char_name;
target->charcurse_list.clear(); target->charcurse_list.clear();
foreach (char_name, argv) { for (QString char_name : argv) {
target->charcurse_list.append(server->getCharID(char_name)); int char_id = server->getCharID(char_name);
} if (char_id == -1) {
if (target->charcurse_list.contains(-1)) { sendServerMessage("Could not find character: " + char_name);
sendServerMessage("One of these characters was not found."); return;
return; }
target->charcurse_list.append(char_id);
} }
} }
target->is_charcursed = true;
//Kick back to char select screen //Kick back to char select screen
if (!target->charcurse_list.contains(server->getCharID(current_char))) { if (!target->charcurse_list.contains(server->getCharID(target->current_char))) {
target->changeCharacter(-1); target->changeCharacter(-1);
server->updateCharsTaken(server->areas.value(current_area));
target->sendPacket("DONE"); target->sendPacket("DONE");
} }
target->is_charcursed = true; else {
server->updateCharsTaken(server->areas.value(current_area)); server->updateCharsTaken(server->areas.value(current_area));
}
target->sendServerMessage("You have been charcursed!"); target->sendServerMessage("You have been charcursed!");
sendServerMessage("Charcursed player."); sendServerMessage("Charcursed player.");
} }
@ -373,7 +375,7 @@ void AOClient::cmdUnCharCurse(int argc, QStringList argv)
return; return;
} }
AOClient* target = server->getClientByID(uid); AOClient* target = server->getClientByID(uid);
if (!target->is_charcursed) { if (!target->is_charcursed) {
sendServerMessage("That player is not charcursed!"); sendServerMessage("That player is not charcursed!");