From 24c91cee053e5b614f48943b83f35035c471e27c Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 4 Jan 2018 18:28:30 -0500 Subject: [PATCH] Some command fixes --- Source/Game/Chat/Commands/NPCCommands.cs | 4 ++-- Source/Game/Chat/Commands/ServerCommands.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Game/Chat/Commands/NPCCommands.cs b/Source/Game/Chat/Commands/NPCCommands.cs index 1528cacc4..3afbc6426 100644 --- a/Source/Game/Chat/Commands/NPCCommands.cs +++ b/Source/Game/Chat/Commands/NPCCommands.cs @@ -289,7 +289,7 @@ namespace Game.Chat handler.SendSysMessage(CypherStrings.SelectCreature); return false; } - string text = args.NextString(); + string text = args.GetString(); creature.Say(text, Language.Universal); // make some emotes @@ -316,7 +316,7 @@ namespace Game.Chat return false; string receiver_str = args.NextString(); - string text = args.NextString(); + string text = args.NextString(""); if (string.IsNullOrEmpty(receiver_str) || string.IsNullOrEmpty(text)) { diff --git a/Source/Game/Chat/Commands/ServerCommands.cs b/Source/Game/Chat/Commands/ServerCommands.cs index 29feeb132..4594b246c 100644 --- a/Source/Game/Chat/Commands/ServerCommands.cs +++ b/Source/Game/Chat/Commands/ServerCommands.cs @@ -66,7 +66,11 @@ namespace Game.Chat [Command("motd", RBACPermissions.CommandServerMotd, true)] static bool Motd(StringArguments args, CommandHandler handler) { - handler.SendSysMessage(CypherStrings.MotdCurrent, Global.WorldMgr.GetMotd()); + string motd = ""; + foreach (var line in Global.WorldMgr.GetMotd()) + motd += line; + + handler.SendSysMessage(CypherStrings.MotdCurrent, motd); return true; } @@ -349,7 +353,7 @@ namespace Game.Chat static bool SetMotd(StringArguments args, CommandHandler handler) { Global.WorldMgr.SetMotd(args.NextString("")); - handler.SendSysMessage(CypherStrings.MotdNew, args); + handler.SendSysMessage(CypherStrings.MotdNew, args.GetString()); return true; }