From 03b1c2b183a6e8ca9359c616ed630540da582b65 Mon Sep 17 00:00:00 2001
From: David Markowitz <EmosewaMC@gmail.com>
Date: Sun, 29 Jun 2025 01:43:53 -0700
Subject: [PATCH] fix: Split String returning an empty string when an empty
 string is passed in

Tested that slash commands function as before, except now if you pass no arguments to a command like /fly, it no longer reports an invalid command.
---
 dCommon/GeneralUtils.cpp                 | 51 ------------------------
 dCommon/GeneralUtils.h                   | 18 +++++++--
 dGame/dComponents/InventoryComponent.cpp |  2 +-
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/dCommon/GeneralUtils.cpp b/dCommon/GeneralUtils.cpp
index 7cc9278b..83205085 100644
--- a/dCommon/GeneralUtils.cpp
+++ b/dCommon/GeneralUtils.cpp
@@ -237,57 +237,6 @@ bool GeneralUtils::ReplaceInString(std::string& str, const std::string_view from
 	return true;
 }
 
-std::vector<std::wstring> GeneralUtils::SplitString(const std::wstring_view str, const wchar_t delimiter) {
-	std::vector<std::wstring> vector = std::vector<std::wstring>();
-	std::wstring current;
-
-	for (const wchar_t c : str) {
-		if (c == delimiter) {
-			vector.push_back(current);
-			current = L"";
-		} else {
-			current += c;
-		}
-	}
-
-	vector.push_back(std::move(current));
-	return vector;
-}
-
-std::vector<std::u16string> GeneralUtils::SplitString(const std::u16string_view str, const char16_t delimiter) {
-	std::vector<std::u16string> vector = std::vector<std::u16string>();
-	std::u16string current;
-
-	for (const char16_t c : str) {
-		if (c == delimiter) {
-			vector.push_back(current);
-			current = u"";
-		} else {
-			current += c;
-		}
-	}
-
-	vector.push_back(std::move(current));
-	return vector;
-}
-
-std::vector<std::string> GeneralUtils::SplitString(const std::string_view str, const char delimiter) {
-	std::vector<std::string> vector = std::vector<std::string>();
-	std::string current = "";
-
-	for (const char c : str) {
-		if (c == delimiter) {
-			vector.push_back(current);
-			current = "";
-		} else {
-			current += c;
-		}
-	}
-
-	vector.push_back(std::move(current));
-	return vector;
-}
-
 std::u16string GeneralUtils::ReadWString(RakNet::BitStream& inStream) {
 	uint32_t length;
 	inStream.Read<uint32_t>(length);
diff --git a/dCommon/GeneralUtils.h b/dCommon/GeneralUtils.h
index 69c5fc44..498f6cf1 100644
--- a/dCommon/GeneralUtils.h
+++ b/dCommon/GeneralUtils.h
@@ -130,11 +130,23 @@ namespace GeneralUtils {
 
 	std::u16string ReadWString(RakNet::BitStream& inStream);
 
-	std::vector<std::wstring> SplitString(const std::wstring_view str, const wchar_t delimiter);
+	template<typename StringType, typename CharType = typename StringType::value_type>
+	std::vector<std::basic_string<CharType>> SplitString(const StringType& str, const typename StringType::value_type delimiter) {
+		std::vector<std::basic_string<CharType>> toReturn{};
 
-	std::vector<std::u16string> SplitString(const std::u16string_view str, const char16_t delimiter);
+		toReturn.emplace_back();
+		auto itr = toReturn.rbegin();
+		for (const auto c : str) {
+			if (c == delimiter) {
+				toReturn.emplace_back();
+				itr = toReturn.rbegin();
+			} else {
+				(*itr).push_back(c);
+			}
+		}
 
-	std::vector<std::string> SplitString(const std::string_view str, const char delimiter);
+		return toReturn;
+	}
 
 	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string_view folder);
 
diff --git a/dGame/dComponents/InventoryComponent.cpp b/dGame/dComponents/InventoryComponent.cpp
index 4cc0a3de..cabf5e3d 100644
--- a/dGame/dComponents/InventoryComponent.cpp
+++ b/dGame/dComponents/InventoryComponent.cpp
@@ -1777,7 +1777,7 @@ void InventoryComponent::LoadGroupXml(const tinyxml2::XMLElement& groups) {
 			group.groupId = groupId;
 			group.groupName = groupName;
 
-			for (const auto& lotStr : GeneralUtils::SplitString(lots, ' ')) {
+			for (const auto& lotStr : GeneralUtils::SplitString(std::string_view(lots), ' ')) {
 				auto lot = GeneralUtils::TryParse<LOT>(lotStr);
 				if (lot) group.lots.insert(*lot);
 			}