Fix parse item method to ignore game object links

cmangos · May 16, 2024 · 457beb8 · 457beb8
1 parent 7a483bf
commit 457beb8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/playerbot/ChatHelper.cpp b/playerbot/ChatHelper.cpp
@@ -282,16 +282,31 @@ uint32 ChatHelper::parseMoney(std::string& text)
     return copper;
 }
 
-ItemIds ChatHelper::parseItems(const std::string& text, bool validate, bool parseItemNames)
+ItemIds ChatHelper::parseItems(const std::string& text, bool validate)
 {
-    std::vector<uint32> itemIDsUnordered = parseItemsUnordered(text, validate, parseItemNames);
+    std::vector<uint32> itemIDsUnordered = parseItemsUnordered(text, validate);
     return ItemIds(itemIDsUnordered.begin(), itemIDsUnordered.end());
 }
 
-std::vector<uint32> ChatHelper::parseItemsUnordered(const std::string& text, bool validate, bool parseItemNames)
+std::vector<uint32> ChatHelper::parseItemsUnordered(const std::string& text, bool validate)
 {
-    // Replace all item links with item ids
     std::string textCpy = text;
+
+    // Remove gameobject links
+    if (textCpy.find("Hfound:") != -1)
+    {
+        std::vector<std::string> goLinks = findSubstringsBetween(textCpy, "|c", "|r", true);
+        for (const std::string& goLink : goLinks)
+        {
+            std::vector<std::string> goIDs = findSubstringsBetween(goLink, "Hfound:", ":");
+            if (!goIDs.empty())
+            {
+                replaceSubstring(textCpy, goLink, "");
+            }
+        }
+    }
+
+    // Replace all item links with item ids
     if (textCpy.find("Hitem:") != -1)
     {
         std::vector<std::string> itemLinks = findSubstringsBetween(textCpy, "|c", "|r", true);
@@ -323,16 +338,6 @@ std::vector<uint32> ChatHelper::parseItemsUnordered(const std::string& text, boo
                 itemIds.push_back(std::stoi(itemStr));
             }
         }
-        else if (parseItemNames)
-        {
-            std::string itemName = itemStr;
-            WorldDatabase.escape_string(itemName);
-            auto queryResult = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE name LIKE '%s'", itemName.c_str());
-            if (queryResult)
-            {
-                itemIds.push_back(queryResult->Fetch()->GetUInt16());
-            }
-        }
     }
 
     return itemIds;

diff --git a/playerbot/ChatHelper.h b/playerbot/ChatHelper.h
@@ -30,8 +30,8 @@ namespace ai
         static std::string formatItem(ItemPrototype const * proto, int count = 0, int total = 0);
         static std::string formatItem(Item* item, int count = 0, int total = 0);
         static std::string formatQItem(uint32 itemId);
-        static ItemIds parseItems(const std::string& text, bool validate = false, bool parseItemNames = false);
-        static std::vector<uint32> parseItemsUnordered(const std::string& text, bool validate = false, bool parseItemNames = false);
+        static ItemIds parseItems(const std::string& text, bool validate = false);
+        static std::vector<uint32> parseItemsUnordered(const std::string& text, bool validate = false);
         static std::set<std::string> parseItemQualifiers(std::string& text);
         static uint32 parseItemQuality(std::string text);
         static bool parseItemClass(std::string text, uint32* itemClass, uint32* itemSubClass);

diff --git a/playerbot/strategy/actions/UseItemAction.cpp b/playerbot/strategy/actions/UseItemAction.cpp
@@ -175,8 +175,7 @@ bool UseAction::Execute(Event& event)
     }
     else
     {
-        std::vector<uint32> items = chat->parseItemsUnordered(name, false, true);
-
+        std::vector<uint32> items = chat->parseItemsUnordered(name, false);
         if (items.empty())
         {
             std::list<Item*> inventoryItems = AI_VALUE2(std::list<Item*>, "inventory items", name);