pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix possible crash in #givemoney. (#1828)

Browse Source
This commit is contained in:
Kinglykrab 2021-11-25 13:55:06 -05:00 committed by GitHub
parent 1a5f48521d
commit d38b8a4867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/string_util.cpp
View File

@ -1205,11 +1205,6 @@ std::string ConvertMoneyToString(uint32 platinum, uint32 gold, uint32 silver, ui
silver,
copper
);
} else if (copper && !silver && !gold && !platinum) { // C
money_string = fmt::format(
"{} Copper",
copper
);
} else if (!copper && silver && gold && platinum) { // SGP
money_string = fmt::format(
"{} Platinum, {} Gold, and {} Silver",
@ -1223,11 +1218,6 @@ std::string ConvertMoneyToString(uint32 platinum, uint32 gold, uint32 silver, ui
gold,
silver
);
} else if (!copper && silver && !gold && !platinum) { // S
money_string = fmt::format(
"{} Silver",
silver
);
} else if (copper && !silver && gold && platinum) { // CGP
money_string = fmt::format(
"{} Platinum, {} Gold, and {} Copper",
@ -1247,11 +1237,26 @@ std::string ConvertMoneyToString(uint32 platinum, uint32 gold, uint32 silver, ui
platinum,
gold
);
} else if (!copper && !silver && !gold && platinum) { // P
money_string = fmt::format(
"{} Platinum",
platinum
);
} else if (!copper && !silver && gold && !platinum) { // G
money_string = fmt::format(
"{} Gold",
gold
);
} else if (!copper && silver && !gold && !platinum) { // S
money_string = fmt::format(
"{} Silver",
silver
);
} else if (copper && !silver && !gold && !platinum) { // C
money_string = fmt::format(
"{} Copper",
copper
);
}
return money_string;
}

8
zone/gm_commands/givemoney.cpp
View File

@ -14,10 +14,10 @@ void command_givemoney(Client *c, const Seperator *sep)
target = c->GetTarget()->CastToClient();
}
uint32 platinum = std::stoi(sep->arg[1]);
uint32 gold = std::stoi(sep->arg[2]);
uint32 silver = std::stoi(sep->arg[3]);
uint32 copper = std::stoi(sep->arg[4]);
uint32 platinum = std::stoul(sep->arg[1]);
uint32 gold = sep->IsNumber(2) ? std::stoul(sep->arg[2]) : 0;
uint32 silver = sep->IsNumber(3) ? std::stoul(sep->arg[3]) : 0;
uint32 copper = sep->IsNumber(4) ? std::stoul(sep->arg[4]) : 0;
if (!platinum && !gold && !silver && !copper) {
c->Message(Chat::Red, "Usage: #Usage: #givemoney [Platinum] [Gold] [Silver] [Copper]");
return;