From 0d345c5a5086baffec123f6be6cce77e33f365c0 Mon Sep 17 00:00:00 2001 From: Kargatum Date: Fri, 19 Nov 2021 20:55:33 +0700 Subject: [PATCH] fix(Core/Scripts): add support using whitespace for cs_lookup (#9243) --- src/server/scripts/Commands/cs_lookup.cpp | 98 +++++++++++++++++++---- 1 file changed, 84 insertions(+), 14 deletions(-) diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index 68372f85d..998c505a0 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -78,8 +78,13 @@ public: return commandTable; } - static bool HandleLookupAreaCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupAreaCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; if (!Utf8toWStr(namePart, wNamePart)) @@ -164,8 +169,13 @@ public: return true; } - static bool HandleLookupCreatureCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupCreatureCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; // converting string that we try to find to lower case @@ -255,8 +265,13 @@ public: return true; } - static bool HandleLookupEventCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupEventCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; // converting string that we try to find to lower case @@ -318,8 +333,13 @@ public: return true; } - static bool HandleLookupFactionCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupFactionCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + // Can be nullptr at console call Player* target = handler->getSelectedPlayer(); @@ -451,8 +471,13 @@ public: return true; } - static bool HandleLookupItemCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupItemCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; // converting string that we try to find to lower case @@ -546,8 +571,13 @@ public: return true; } - static bool HandleLookupItemSetCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupItemSetCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; if (!Utf8toWStr(namePart, wNamePart)) @@ -632,8 +662,13 @@ public: return true; } - static bool HandleLookupObjectCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupObjectCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; // converting string that we try to find to lower case @@ -722,8 +757,13 @@ public: return true; } - static bool HandleLookupQuestCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupQuestCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + // can be nullptr at console call Player* target = handler->getSelectedPlayer(); @@ -863,8 +903,13 @@ public: return true; } - static bool HandleLookupSkillCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupSkillCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + // can be nullptr in console call Player* target = handler->getSelectedPlayer(); @@ -963,8 +1008,13 @@ public: return true; } - static bool HandleLookupSpellCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupSpellCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + // can be nullptr at console call Player* target = handler->getSelectedPlayer(); @@ -1224,8 +1274,13 @@ public: return true; } - static bool HandleLookupTaxiNodeCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupTaxiNodeCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; if (!Utf8toWStr(namePart, wNamePart)) @@ -1310,8 +1365,13 @@ public: } // Find teleport in game_tele order by name - static bool HandleLookupTeleCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupTeleCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; if (!Utf8toWStr(namePart, wNamePart)) @@ -1367,8 +1427,13 @@ public: return true; } - static bool HandleLookupTitleCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupTitleCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + // can be nullptr in console call Player* target = handler->getSelectedPlayer(); @@ -1456,8 +1521,13 @@ public: return true; } - static bool HandleLookupMapCommand(ChatHandler* handler, std::string_view namePart) + static bool HandleLookupMapCommand(ChatHandler* handler, Tail namePart) { + if (namePart.empty()) + { + return false; + } + std::wstring wNamePart; if (!Utf8toWStr(namePart, wNamePart))