AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 12:42:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

actually fix #435

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-21 17:36:46 +10:00
parent d6537b42a9
commit 8520799833
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MCGalaxy/Commands/Bots/CmdBot.cs
View File

@ -45,6 +45,9 @@ namespace MCGalaxy.Commands.Bots {
} else if (args[0].CaselessEq("deathmsg") || args[0].CaselessEq("deathmessage")) { } else if (args[0].CaselessEq("deathmsg") || args[0].CaselessEq("deathmessage")) {
string text = args.Length > 2 ? args[2] : null; string text = args.Length > 2 ? args[2] : null;
SetDeathMessage(p, args[1], text); SetDeathMessage(p, args[1], text);
} else if (args[0].CaselessEq("rename")) {
string newName = args.Length > 2 ? args[2] : null;
RenameBot(p, args[1], newName);
} else { } else {
Help(p); Help(p);
} }
@ -53,7 +56,7 @@ namespace MCGalaxy.Commands.Bots {
void AddBot(Player p, string botName) { void AddBot(Player p, string botName) {
if (!LevelInfo.ValidateAction(p, p.level.name, "add bots to this level")) return; if (!LevelInfo.ValidateAction(p, p.level.name, "add bots to this level")) return;
if (BotExists(p.level, botName)) { if (BotExists(p.level, botName, null)) {
Player.Message(p, "A bot with that name already exists."); return; Player.Message(p, "A bot with that name already exists."); return;
} }
if (p.level.Bots.Count >= ServerConfig.MaxBotsPerLevel) { if (p.level.Bots.Count >= ServerConfig.MaxBotsPerLevel) {
@ -68,9 +71,10 @@ namespace MCGalaxy.Commands.Bots {
PlayerBot.Add(bot); PlayerBot.Add(bot);
} }
static bool BotExists(Level lvl, string name) { static bool BotExists(Level lvl, string name, PlayerBot skip) {
PlayerBot[] bots = lvl.Bots.Items; PlayerBot[] bots = lvl.Bots.Items;
foreach (PlayerBot bot in bots) { foreach (PlayerBot bot in bots) {
if (bot == skip) continue;
if (bot.name.CaselessEq(name)) return true; if (bot.name.CaselessEq(name)) return true;
} }
return false; return false;
@ -91,6 +95,28 @@ namespace MCGalaxy.Commands.Bots {
} }
} }
void RenameBot(Player p, string botName, string newName) {
if (!LevelInfo.ValidateAction(p, p.level.name, "rename bots on this level")) return;
if (newName == null) { Player.Message(p, "New name of bot required."); return; }
if (!Formatter.ValidName(p, newName, "bot")) return;
PlayerBot bot = Matcher.FindBots(p, botName);
if (bot == null) return;
if (BotExists(p.level, newName, bot)) {
Player.Message(p, "A bot with the new name already exists."); return;
}
Player.Message(p, "Renamed bot {0}", bot.ColoredName);
if (bot.DisplayName == bot.name) {
bot.DisplayName = newName;
bot.GlobalDespawn();
bot.GlobalSpawn();
}
bot.name = newName;
BotsFile.Save(bot.level);
}
void SetBotText(Player p, string botName, string text) { void SetBotText(Player p, string botName, string text) {
PlayerBot bot = Matcher.FindBots(p, botName); PlayerBot bot = Matcher.FindBots(p, botName);
if (bot == null) return; if (bot == null) return;
@ -133,7 +159,7 @@ namespace MCGalaxy.Commands.Bots {
Player.Message(p, "%T/Bot deathmessage [name] <message>"); Player.Message(p, "%T/Bot deathmessage [name] <message>");
Player.Message(p, "%HSets the message shown when this bot kills a player"); Player.Message(p, "%HSets the message shown when this bot kills a player");
Player.Message(p, "%T/Bot rename [name] [new name] %H- Renames a bot"); Player.Message(p, "%T/Bot rename [name] [new name] %H- Renames a bot");
Player.Message(p, "%H Note: To change name tag of a bot, use %T/nick bot"); Player.Message(p, "%H Note: To only change name tag of a bot, use %T/nick bot");
} }
} }
} }