AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-27 07:11:04 -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) {

57
Commands/Information/CmdInfo.cs
View File

@ -27,38 +27,33 @@ 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 != "")
{ Player.SendMessage(p, "This server's name is &b" + Server.name + "%S.");
Help(p); Player.SendMessage(p, "There are currently " + Player.number + " players online.");
} Player.SendMessage(p, "There are " + Player.GetBannedCount() + " &8banned%S players.");
else 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 name is &b" + Server.name + "%S."); Player.SendMessage(p, "This server runs on &bMCGalaxy &a" + Server.VersionString +
Player.SendMessage(p, "There are currently " + Player.number + " players on this server"); "%S, which is based on &bMCForge %Sand &bMCLawl%S.");
Player.SendMessage(p, "This server currently has $banned people that are &8banned%S."); Command.all.Find("devs").Use(p, "");
Player.SendMessage(p, "This server currently has " + LevelInfo.Loaded.Count + " levels loaded.");
Player.SendMessage(p, "This server's currency is: " + Server.moneys); TimeSpan up = DateTime.Now - Server.timeOnline;
Player.SendMessage(p, "This server runs on &bMCGalaxy" + Server.DefaultColor + ", which is based on &bMCLawl" + Server.DefaultColor + "."); string upTime = "Time online: &b";
Player.SendMessage(p, "This server's version: &a" + Server.VersionString); if (up.Days == 1) upTime += up.Days + " day, ";
Command.all.Find("devs").Use(p, ""); else if (up.Days > 0) upTime += up.Days + " days, ";
TimeSpan up = DateTime.Now - Server.timeOnline; if (up.Hours == 1) upTime += up.Hours + " hour, ";
string upTime = "Time online: &b"; else if (up.Days > 0 || up.Hours > 0) upTime += up.Hours + " hours, ";
if (up.Days == 1) upTime += up.Days + " day, "; if (up.Minutes == 1) upTime += up.Minutes + " minute and ";
else if (up.Days > 0) upTime += up.Days + " days, "; else if (up.Hours > 0 || up.Days > 0 || up.Minutes > 0) upTime += up.Minutes + " minutes and ";
if (up.Hours == 1) upTime += up.Hours + " hour, "; if (up.Seconds == 1) upTime += up.Seconds + " second";
else if (up.Days > 0 || up.Hours > 0) upTime += up.Hours + " hours, "; else upTime += up.Seconds + " seconds";
if (up.Minutes == 1) upTime += up.Minutes + " minute and "; Player.SendMessage(p, upTime);
else if (up.Hours > 0 || up.Days > 0 || up.Minutes > 0) upTime += up.Minutes + " minutes and "; if (Server.updateTimer.Interval > 1000) Player.SendMessage(p, "This server is currently in &5Low Lag" + Server.DefaultColor + " mode.");
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."); Player.SendMessage(p, "/info - Displays the server information.");
} }
} }

2
Commands/Moderation/CmdModerate.cs
View File

@ -38,7 +38,7 @@ namespace MCGalaxy.Commands
else else
{ {
Server.chatmod = true; 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) public override void Help(Player p)

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 {