pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-29 04:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Crash] Fix command crash with #npcedit weapon when second weapon not passed ni (#2829)

Browse Source
This commit is contained in:
Chris Miles 2023-02-06 17:24:24 -06:00 committed by GitHub
parent d369b47ef4
commit 34d21d4056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/gm_commands/npcedit.cpp
View File

@ -536,14 +536,14 @@ void command_npcedit(Client *c, const Seperator *sep)
} else if (!strcasecmp(sep->arg[1], "weapon")) { } else if (!strcasecmp(sep->arg[1], "weapon")) {
if (sep->IsNumber(2)) { if (sep->IsNumber(2)) {
auto primary_model = std::stoul(sep->arg[2]); auto primary_model = std::stoul(sep->arg[2]);
uint32_t secondary_model = sep->IsNumber(3) ? std::stoul(sep->arg[3]) : 0; uint32_t secondary_model = sep->arg[3] && sep->IsNumber(3) ? std::stoul(sep->arg[3]) : 0;
n.d_melee_texture1 = primary_model; n.d_melee_texture1 = primary_model;
n.d_melee_texture2 = secondary_model; n.d_melee_texture2 = secondary_model;
d = fmt::format( d = fmt::format(
"{} will have Model {} set to their Primary and Model {} set to their Secondary on repop.", "{} will have Model {} set to their Primary and Model {} set to their Secondary on repop.",
npc_id_string, npc_id_string,
Strings::Commify(sep->arg[2]), Strings::Commify(sep->arg[2]),
sep->IsNumber(3) ? Strings::Commify(sep->arg[3]) : 0 sep->arg[3] && sep->IsNumber(3) ? Strings::Commify(sep->arg[3]) : 0
); );
} else { } else {
c->Message( c->Message(