Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2023-05-29 19:05:17 +08:00
34 changed files with 960 additions and 578 deletions

View File

@@ -70,14 +70,21 @@ public:
{
auto itemTokens = Acore::Tokenize(itemString, ':', false);
if (itemTokens.size() != 2)
uint32 itemCount;
switch (itemTokens.size())
{
handler->SendSysMessage(Acore::StringFormatFmt("> Incorrect item list format for '{}'", itemString));
continue;
case 1:
itemCount = 1; // Default to sending 1 item
break;
case 2:
itemCount = *Acore::StringTo<uint32>(itemTokens.at(1));
break;
default:
handler->SendSysMessage(Acore::StringFormatFmt("> Incorrect item list format for '{}'", itemString));
continue;
}
uint32 itemID = *Acore::StringTo<uint32>(itemTokens.at(0));
uint32 itemCount = *Acore::StringTo<uint32>(itemTokens.at(1));
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemID);
if (!itemTemplate)