From b5f311bf56e32bca6deb45f6a04dd1e3f42cb3fe Mon Sep 17 00:00:00 2001 From: KJack Date: Sun, 28 May 2023 15:28:01 -0400 Subject: [PATCH] fix(Scripts/Commands): Fix '.send items' command to no longer require an itemId count (#16340) * Fix '.send items' command to no longer require an itemId count * Remove leftover debugging output, oops. --- src/server/scripts/Commands/cs_send.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp index 65133672b..be2040cfa 100644 --- a/src/server/scripts/Commands/cs_send.cpp +++ b/src/server/scripts/Commands/cs_send.cpp @@ -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(itemTokens.at(1)); + break; + default: + handler->SendSysMessage(Acore::StringFormatFmt("> Incorrect item list format for '{}'", itemString)); + continue; } uint32 itemID = *Acore::StringTo(itemTokens.at(0)); - uint32 itemCount = *Acore::StringTo(itemTokens.at(1)); ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemID); if (!itemTemplate)