From 3f85eb9ac66b82c612e018b3d64a97af01f8c55c Mon Sep 17 00:00:00 2001 From: IntelligentQuantum Date: Sat, 5 Feb 2022 21:13:39 +0330 Subject: [PATCH] fix(Scripts/Commands): cs_list crash (#10480) * Update cs_list.cpp * This way? not tested * Update cs_list.cpp --- src/server/scripts/Commands/cs_list.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 855ce22c9..7e9d44ddf 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -85,19 +85,19 @@ public: QueryResult result; uint32 creatureCount = 0; - result = WorldDatabase.Query("SELECT COUNT(guid) FROM creature WHERE id='{}'", uint32(creatureId)); + result = WorldDatabase.Query("SELECT COUNT(guid) FROM creature WHERE id1='{}' OR id2='{}' OR id3='{}'", uint32(creatureId), uint32(creatureId), uint32(creatureId)); if (result) creatureCount = (*result)[0].Get(); if (handler->GetSession()) { Player* player = handler->GetSession()->GetPlayer(); - result = WorldDatabase.Query("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '{}', 2) + POW(position_y - '{}', 2) + POW(position_z - '{}', 2)) AS order_ FROM creature WHERE id = '{}' ORDER BY order_ ASC LIMIT {}", - player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), uint32(creatureId), count); + result = WorldDatabase.Query("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '{}', 2) + POW(position_y - '{}', 2) + POW(position_z - '{}', 2)) AS order_ FROM creature WHERE id1='{}' OR id2='{}' OR id3='{}' ORDER BY order_ ASC LIMIT {}", + player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), uint32(creatureId), uint32(creatureId), uint32(creatureId), count); } else - result = WorldDatabase.Query("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id = '{}' LIMIT {}", - uint32(creatureId), count); + result = WorldDatabase.Query("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id1='{}' OR id2='{}' OR id3='{}' LIMIT {}", + uint32(creatureId), uint32(creatureId), uint32(creatureId), count); if (result) {