diff --git a/MCGalaxy/Commands/Chat/CmdLoginMessage.cs b/MCGalaxy/Commands/Chat/CmdLoginMessage.cs index 48f562475..33a5551e1 100644 --- a/MCGalaxy/Commands/Chat/CmdLoginMessage.cs +++ b/MCGalaxy/Commands/Chat/CmdLoginMessage.cs @@ -37,11 +37,11 @@ namespace MCGalaxy.Commands.Chatting { if (loginMsg.Length == 0) { string path = PlayerDB.LoginPath(who.name); if (File.Exists(path)) File.Delete(path); - Player.Message(p, "The login message of {0} %Shas been removed.", + Player.Message(p, "Login message of {0} %Swas removed.", who.ColoredName); } else { PlayerDB.SetLoginMessage(who.name, loginMsg); - Player.Message(p, "The login message of {0} %Shas been changed to: {1}", + Player.Message(p, "Login message of {0} %Swas changed to: {1}", who.ColoredName, loginMsg); } } diff --git a/MCGalaxy/Commands/Chat/CmdLogoutMessage.cs b/MCGalaxy/Commands/Chat/CmdLogoutMessage.cs index a8cbbd2bb..0d3a24d44 100644 --- a/MCGalaxy/Commands/Chat/CmdLogoutMessage.cs +++ b/MCGalaxy/Commands/Chat/CmdLogoutMessage.cs @@ -37,11 +37,11 @@ namespace MCGalaxy.Commands.Chatting { if (logoutMsg.Length == 0) { string path = PlayerDB.LogoutPath(who.name); if (File.Exists(path)) File.Delete(path); - Player.Message(p, "The logout message of {0} %Shas been removed.", + Player.Message(p, "Logout message of {0} %Swas removed.", who.ColoredName); } else { PlayerDB.SetLogoutMessage(who.name, logoutMsg); - Player.Message(p, "The logout message of {0} %Shas been changed to: {1}", + Player.Message(p, "Logout message of {0} %Swas changed to: {1}", who.ColoredName, logoutMsg); } } diff --git a/MCGalaxy/Economy/MessageItems.cs b/MCGalaxy/Economy/MessageItems.cs index 84f3e0c39..c91cd2fe7 100644 --- a/MCGalaxy/Economy/MessageItems.cs +++ b/MCGalaxy/Economy/MessageItems.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Eco { protected override void DoPurchase(Player p, string message, string[] args) { if (args.Length == 1) { - Command.all.FindByName("LoginMessage").Use(null, p.name); + Command.all.FindByName("LoginMessage").Use(p, "-own"); Player.Message(p, "%aYour login message was removed for free."); return; } @@ -43,8 +43,7 @@ namespace MCGalaxy.Eco { if (text.Length > NetUtils.StringSize) { Player.Message(p, "%cLogin message must be 64 characters or less."); return; } - Command.all.FindByName("LoginMessage").Use(null, p.name + " " + text); - Player.Message(p, "%aYour login message was changed to: %f" + text); + Command.all.FindByName("LoginMessage").Use(p, "-own " + text); Economy.MakePurchase(p, Price, "%3LoginMessage: %f" + text); } } @@ -60,7 +59,7 @@ namespace MCGalaxy.Eco { protected override void DoPurchase(Player p, string message, string[] args) { if (args.Length == 1) { - Command.all.FindByName("LogoutMessage").Use(null, p.name); + Command.all.FindByName("LogoutMessage").Use(p, "-own"); Player.Message(p, "%aYour logout message was removed for free."); return; } @@ -72,8 +71,7 @@ namespace MCGalaxy.Eco { if (text.Length > NetUtils.StringSize) { Player.Message(p, "%cLogin message must be 64 characters or less."); return; } - Command.all.FindByName("LogoutMessage").Use(null, p.name + " " + text); - Player.Message(p, "%aYour logout message was changed to: %f" + text); + Command.all.FindByName("LogoutMessage").Use(p, "-own " + text); Economy.MakePurchase(p, Price, "%3LogoutMessage: %f" + text); } } diff --git a/MCGalaxy/Economy/NameItems.cs b/MCGalaxy/Economy/NameItems.cs index 4d3cac967..1dfac9f33 100644 --- a/MCGalaxy/Economy/NameItems.cs +++ b/MCGalaxy/Economy/NameItems.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Eco { protected override void DoPurchase(Player p, string message, string[] args) { if (args.Length == 1) { - Command.all.FindByName("Title").Use(null, p.name); + Command.all.FindByName("Title").Use(p, "-own"); Player.Message(p, "%aYour title was removed for free."); return; } @@ -42,8 +42,7 @@ namespace MCGalaxy.Eco { Player.Message(p, "%cTitles must be under 20 characters."); return; } - Command.all.FindByName("Title").Use(null, p.name + " " + title); - Player.Message(p, "%aYour title was changed to [" + p.titlecolor + title + "%a]"); + Command.all.FindByName("Title").Use(p, "-own " + title); Economy.MakePurchase(p, Price, "%3Title: %f" + title); } } @@ -59,7 +58,7 @@ namespace MCGalaxy.Eco { protected override void DoPurchase(Player p, string message, string[] args) { if (args.Length == 1) { - Command.all.FindByName("Nick").Use(null, p.name); + Command.all.FindByName("Nick").Use(p, "-own"); Player.Message(p, "%aYour nickname was removed for free."); return; } @@ -71,8 +70,7 @@ namespace MCGalaxy.Eco { Player.Message(p, "%cNicknames must be under 30 characters."); return; } - Command.all.FindByName("Nick").Use(null, p.name + " " + nick); - Player.Message(p, "%aYour nickname was changed to [" + p.color + nick + "%a]"); + Command.all.FindByName("Nick").Use(p, "-own " + nick); Economy.MakePurchase(p, Price, "%3Nickname: %f" + nick); } } @@ -94,8 +92,7 @@ namespace MCGalaxy.Eco { Player.Message(p, "%cYou already have a " + color + colName + "%c titlecolor"); return; } - Command.all.FindByName("TColor").Use(null, p.name + " " + colName); - Player.Message(p, "%aYour titlecolor was changed to " + color + colName); + Command.all.FindByName("TColor").Use(p, "-own " + colName); Economy.MakePurchase(p, Price, "%3Titlecolor: " + color + colName); } } @@ -117,7 +114,7 @@ namespace MCGalaxy.Eco { Player.Message(p, "%cYou already have a " + color + colName + "%c color"); return; } - Command.all.FindByName("Color").Use(null, p.name + " " + colName); + Command.all.FindByName("Color").Use(p, "-own " + colName); Economy.MakePurchase(p, Price, "%3Color: " + color + colName); } }