Bug #1328 - Fixed fantasy to re-split message parameters correctly

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/pseudoclients/bs_main.cpp b/modules/pseudoclients/bs_main.cpp
index 488c30de6..c64cb5786 100644
--- a/modules/pseudoclients/bs_main.cpp
+++ b/modules/pseudoclients/bs_main.cpp
@@ -102,7 +102,14 @@ class BotServCore : public Module
 		if (this->fantasy_channel != NULL)
 		{
 			if (!command->HasFlag(CFLAG_STRIP_CHANNEL))
+			{
 				params.insert(params.begin(), this->fantasy_channel->name);
+				if (command->MaxParams && params.size() > command->MaxParams)
+				{
+					params[params.size() - 2] += " " + params[params.size() - 1];
+					params.erase(params.end() - 1);
+				}
+			}
 			source.c = this->fantasy_channel;
 			source.service = this->fantasy_channel->ci->WhoSends();
 		}