From 1132c7d90bd7af460f012afa86c1b0b9629dbf51 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 27 Mar 2016 12:51:27 +1100 Subject: [PATCH] Should not be able to use /afk while muted (Thanks goodlyay), also cleanup /info a bit. --- Commands/Information/CmdAfk.cs | 1 + Commands/Information/CmdInfo.cs | 57 ++++++++++++++---------------- Commands/Moderation/CmdModerate.cs | 2 +- Player/Player.Handlers.cs | 4 +-- 4 files changed, 30 insertions(+), 34 deletions(-) diff --git a/Commands/Information/CmdAfk.cs b/Commands/Information/CmdAfk.cs index 71b4e5791..559559c53 100644 --- a/Commands/Information/CmdAfk.cs +++ b/Commands/Information/CmdAfk.cs @@ -34,6 +34,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "You cannot use /afk while chat moderation is enabled"); return; } + if (p != null && p.muted) { Player.SendMessage(p, "Cannot use /afk while muted."); return; } if (message == "list") { foreach (string s in Server.afkset) { diff --git a/Commands/Information/CmdInfo.cs b/Commands/Information/CmdInfo.cs index 38fe66cb3..16992e1b2 100644 --- a/Commands/Information/CmdInfo.cs +++ b/Commands/Information/CmdInfo.cs @@ -27,38 +27,33 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public CmdInfo() { } - public override void Use(Player p, string message) - { - if (message != "") - { - Help(p); - } - else - { - Player.SendMessage(p, "This server's name is &b" + Server.name + "%S."); - Player.SendMessage(p, "There are currently " + Player.number + " players on this server"); - Player.SendMessage(p, "This server currently has $banned people that are &8banned%S."); - Player.SendMessage(p, "This server currently has " + LevelInfo.Loaded.Count + " levels loaded."); - Player.SendMessage(p, "This server's currency is: " + Server.moneys); - Player.SendMessage(p, "This server runs on &bMCGalaxy" + Server.DefaultColor + ", which is based on &bMCLawl" + Server.DefaultColor + "."); - Player.SendMessage(p, "This server's version: &a" + Server.VersionString); - Command.all.Find("devs").Use(p, ""); - TimeSpan up = DateTime.Now - Server.timeOnline; - string upTime = "Time online: &b"; - if (up.Days == 1) upTime += up.Days + " day, "; - else if (up.Days > 0) upTime += up.Days + " days, "; - if (up.Hours == 1) upTime += up.Hours + " hour, "; - else if (up.Days > 0 || up.Hours > 0) upTime += up.Hours + " hours, "; - if (up.Minutes == 1) upTime += up.Minutes + " minute and "; - else if (up.Hours > 0 || up.Days > 0 || up.Minutes > 0) upTime += up.Minutes + " minutes and "; - if (up.Seconds == 1) upTime += up.Seconds + " second"; - else upTime += up.Seconds + " seconds"; - Player.SendMessage(p, upTime); - if (Server.updateTimer.Interval > 1000) Player.SendMessage(p, "This server is currently in &5Low Lag" + Server.DefaultColor + " mode."); - } + public override void Use(Player p, string message) { + if (message != "") { Help(p); return; } + + Player.SendMessage(p, "This server's name is &b" + Server.name + "%S."); + Player.SendMessage(p, "There are currently " + Player.number + " players online."); + Player.SendMessage(p, "There are " + Player.GetBannedCount() + " &8banned%S players."); + Player.SendMessage(p, "There are currently " + LevelInfo.Loaded.Count + " levels loaded."); + Player.SendMessage(p, "This server's currency is: " + Server.moneys); + Player.SendMessage(p, "This server runs on &bMCGalaxy &a" + Server.VersionString + + "%S, which is based on &bMCForge %Sand &bMCLawl%S."); + Command.all.Find("devs").Use(p, ""); + + TimeSpan up = DateTime.Now - Server.timeOnline; + string upTime = "Time online: &b"; + if (up.Days == 1) upTime += up.Days + " day, "; + else if (up.Days > 0) upTime += up.Days + " days, "; + if (up.Hours == 1) upTime += up.Hours + " hour, "; + else if (up.Days > 0 || up.Hours > 0) upTime += up.Hours + " hours, "; + if (up.Minutes == 1) upTime += up.Minutes + " minute and "; + else if (up.Hours > 0 || up.Days > 0 || up.Minutes > 0) upTime += up.Minutes + " minutes and "; + if (up.Seconds == 1) upTime += up.Seconds + " second"; + else upTime += up.Seconds + " seconds"; + Player.SendMessage(p, upTime); + if (Server.updateTimer.Interval > 1000) Player.SendMessage(p, "This server is currently in &5Low Lag" + Server.DefaultColor + " mode."); } - public override void Help(Player p) - { + + public override void Help(Player p) { Player.SendMessage(p, "/info - Displays the server information."); } } diff --git a/Commands/Moderation/CmdModerate.cs b/Commands/Moderation/CmdModerate.cs index 6d6c6da02..3877544b5 100644 --- a/Commands/Moderation/CmdModerate.cs +++ b/Commands/Moderation/CmdModerate.cs @@ -38,7 +38,7 @@ namespace MCGalaxy.Commands else { Server.chatmod = true; - Player.GlobalMessage("Chat moderation engaged! Silence the plebians!"); + Player.GlobalMessage("Chat moderation engaged! Silence the plebians!"); } } public override void Help(Player p) diff --git a/Player/Player.Handlers.cs b/Player/Player.Handlers.cs index f45bf59cf..e9858e2aa 100644 --- a/Player/Player.Handlers.cs +++ b/Player/Player.Handlers.cs @@ -1230,8 +1230,8 @@ try { SendBlockchange(pos1.x, pos1.y, pos1.z, Block.waterstill); } catch { } // Lava Survival map vote recorder if ( Server.lava.HasPlayer(this) && Server.lava.HasVote(text.ToLower()) ) { if ( Server.lava.AddVote(this, text.ToLower()) ) { - SendMessage("Your vote for &5" + text.ToLower().Capitalize() + Server.DefaultColor + " has been placed. Thanks!"); - Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + Server.DefaultColor + "."); + SendMessage("Your vote for &5" + text.ToLower().Capitalize() + " %Shas been placed. Thanks!"); + Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + "%S."); return; } else {