AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-29 16:43:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Should not be able to use /afk while muted (Thanks goodlyay), also cleanup /info a bit.

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-27 12:51:27 +11:00
parent c62ca5f2f3
commit 1132c7d90b
4 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Commands/Information/CmdAfk.cs
View File

@ -34,6 +34,7 @@ namespace MCGalaxy.Commands
Player.SendMessage(p, "You cannot use /afk while chat moderation is enabled"); Player.SendMessage(p, "You cannot use /afk while chat moderation is enabled");
return; return;
} }
if (p != null && p.muted) { Player.SendMessage(p, "Cannot use /afk while muted."); return; }
if (message == "list") { if (message == "list") {
foreach (string s in Server.afkset) { foreach (string s in Server.afkset) {

27
Commands/Information/CmdInfo.cs
View File

@ -27,22 +27,18 @@ namespace MCGalaxy.Commands
public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } }
public CmdInfo() { } public CmdInfo() { }
public override void Use(Player p, string message) public override void Use(Player p, string message) {
{ if (message != "") { Help(p); return; }
if (message != "")
{
Help(p);
}
else
{
Player.SendMessage(p, "This server's name is &b" + Server.name + "%S."); 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, "There are currently " + Player.number + " players online.");
Player.SendMessage(p, "This server currently has $banned people that are &8banned%S."); Player.SendMessage(p, "There are " + Player.GetBannedCount() + " &8banned%S players.");
Player.SendMessage(p, "This server currently has " + LevelInfo.Loaded.Count + " levels loaded."); 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'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 runs on &bMCGalaxy &a" + Server.VersionString +
Player.SendMessage(p, "This server's version: &a" + Server.VersionString); "%S, which is based on &bMCForge %Sand &bMCLawl%S.");
Command.all.Find("devs").Use(p, ""); Command.all.Find("devs").Use(p, "");
TimeSpan up = DateTime.Now - Server.timeOnline; TimeSpan up = DateTime.Now - Server.timeOnline;
string upTime = "Time online: &b"; string upTime = "Time online: &b";
if (up.Days == 1) upTime += up.Days + " day, "; if (up.Days == 1) upTime += up.Days + " day, ";
@ -56,9 +52,8 @@ namespace MCGalaxy.Commands
Player.SendMessage(p, upTime); Player.SendMessage(p, upTime);
if (Server.updateTimer.Interval > 1000) Player.SendMessage(p, "This server is currently in &5Low Lag" + Server.DefaultColor + " mode."); 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."); Player.SendMessage(p, "/info - Displays the server information.");
} }
} }

4
Player/Player.Handlers.cs
View File

@ -1230,8 +1230,8 @@ try { SendBlockchange(pos1.x, pos1.y, pos1.z, Block.waterstill); } catch { }
// Lava Survival map vote recorder // Lava Survival map vote recorder
if ( Server.lava.HasPlayer(this) && Server.lava.HasVote(text.ToLower()) ) { if ( Server.lava.HasPlayer(this) && Server.lava.HasVote(text.ToLower()) ) {
if ( Server.lava.AddVote(this, text.ToLower()) ) { if ( Server.lava.AddVote(this, text.ToLower()) ) {
SendMessage("Your vote for &5" + text.ToLower().Capitalize() + Server.DefaultColor + " has been placed. Thanks!"); SendMessage("Your vote for &5" + text.ToLower().Capitalize() + " %Shas been placed. Thanks!");
Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + Server.DefaultColor + "."); Server.lava.map.ChatLevelOps(name + " voted for &5" + text.ToLower().Capitalize() + "%S.");
return; return;
} }
else { else {