diff options
| author | Gildor <gildor55@gmail.com> | 2024-09-12 22:05:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 22:05:13 +0200 |
| commit | f2a83e8238676a030d814741467bc0a43c0d88d5 (patch) | |
| tree | eb376b164b5aa85c0a778264484e5c4c6f2b0b3f /src | |
| parent | 3e9f8a721c8cb115c70cec098245011330e38e8a (diff) | |
Core/Commands: Improve wp event command (#30226)
* Fixed crash by handling null arg_id in .wp event add
* Fixed incorrect data type conversion in .wp event listid
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Commands/cs_wp.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 6b64aa8b12d..bd78a177d57 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -302,7 +302,11 @@ public: if (show == "add") { - if (Optional<uint32> id = Trinity::StringTo<uint32>(arg_id)) + Optional<uint32> id; + if (arg_id) + id = Trinity::StringTo<uint32>(arg_id); + + if (id) { stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_WAYPOINT_SCRIPT_ID_BY_GUID); stmt->setUInt32(0, *id); @@ -344,9 +348,8 @@ public: uint32 id = Trinity::StringTo<uint32>(arg_id).value_or(0); - uint32 a2, a3, a4, a5, a6; + uint32 a2, a3, a4, a5, a6, a7; float a8, a9, a10, a11; - char const* a7; stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_WAYPOINT_SCRIPT_BY_ID); stmt->setUInt32(0, id); @@ -368,13 +371,13 @@ public: a4 = fields[2].GetUInt32(); a5 = fields[3].GetUInt32(); a6 = fields[4].GetUInt32(); - a7 = fields[5].GetCString(); + a7 = fields[5].GetUInt32(); a8 = fields[6].GetFloat(); a9 = fields[7].GetFloat(); a10 = fields[8].GetFloat(); a11 = fields[9].GetFloat(); - handler->PSendSysMessage("|cffff33ffid:|r|cff00ffff %u|r|cff00ff00, guid: |r|cff00ffff%u|r|cff00ff00, delay: |r|cff00ffff%u|r|cff00ff00, command: |r|cff00ffff%u|r|cff00ff00, datalong: |r|cff00ffff%u|r|cff00ff00, datalong2: |r|cff00ffff%u|r|cff00ff00, datatext: |r|cff00ffff%s|r|cff00ff00, posx: |r|cff00ffff%f|r|cff00ff00, posy: |r|cff00ffff%f|r|cff00ff00, posz: |r|cff00ffff%f|r|cff00ff00, orientation: |r|cff00ffff%f|r", id, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); + handler->PSendSysMessage("|cffff33ffid:|r|cff00ffff %u|r|cff00ff00, guid: |r|cff00ffff%u|r|cff00ff00, delay: |r|cff00ffff%u|r|cff00ff00, command: |r|cff00ffff%u|r|cff00ff00, datalong: |r|cff00ffff%u|r|cff00ff00, datalong2: |r|cff00ffff%u|r|cff00ff00, dataint: |r|cff00ffff%u|r|cff00ff00, posx: |r|cff00ffff%f|r|cff00ff00, posy: |r|cff00ffff%f|r|cff00ff00, posz: |r|cff00ffff%f|r|cff00ff00, orientation: |r|cff00ffff%f|r", id, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } while (result->NextRow()); } |