Some command fixes

This commit is contained in:
hondacrx
2018-01-04 18:28:30 -05:00
parent 796fcd9242
commit 24c91cee05
2 changed files with 8 additions and 4 deletions
+2 -2
View File
@@ -289,7 +289,7 @@ namespace Game.Chat
handler.SendSysMessage(CypherStrings.SelectCreature); handler.SendSysMessage(CypherStrings.SelectCreature);
return false; return false;
} }
string text = args.NextString(); string text = args.GetString();
creature.Say(text, Language.Universal); creature.Say(text, Language.Universal);
// make some emotes // make some emotes
@@ -316,7 +316,7 @@ namespace Game.Chat
return false; return false;
string receiver_str = args.NextString(); string receiver_str = args.NextString();
string text = args.NextString(); string text = args.NextString("");
if (string.IsNullOrEmpty(receiver_str) || string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(receiver_str) || string.IsNullOrEmpty(text))
{ {
+6 -2
View File
@@ -66,7 +66,11 @@ namespace Game.Chat
[Command("motd", RBACPermissions.CommandServerMotd, true)] [Command("motd", RBACPermissions.CommandServerMotd, true)]
static bool Motd(StringArguments args, CommandHandler handler) 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; return true;
} }
@@ -349,7 +353,7 @@ namespace Game.Chat
static bool SetMotd(StringArguments args, CommandHandler handler) static bool SetMotd(StringArguments args, CommandHandler handler)
{ {
Global.WorldMgr.SetMotd(args.NextString("")); Global.WorldMgr.SetMotd(args.NextString(""));
handler.SendSysMessage(CypherStrings.MotdNew, args); handler.SendSysMessage(CypherStrings.MotdNew, args.GetString());
return true; return true;
} }