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

Remove some unused code, also allow configuring gen/admingen limits. (Thanks FabTheZen)

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-10 09:19:56 +11:00
parent 8fe518da49
commit 98ed1bc4f4
7 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Commands/Chat/CmdGlobal.cs
View File

@ -44,18 +44,6 @@ namespace MCGalaxy.Commands
if (p.ignoreGlobalChat || p.ignoreAll) { Player.SendMessage(p, "You cannot use Global Chat while you have it muted."); return; }
if (Server.chatmod && !p.voice) { Player.SendMessage(p, "You cannot use Global Chat while in Chat Moderation!"); return; }
if (!Server.gcaccepted.Contains(p.name.ToLower())) { RulesMethod(p); return; }
string reason;
if (Server.gcnamebans.TryGetValue(p.name.ToLower(), out reason)) {
Player.SendMessage(p, "You are %cBANNED" + Server.DefaultColor + " from %GGlobal Chat" + Server.DefaultColor + " by " + reason);
Player.SendMessage(p, "You can apply a 'Ban Appeal' at %9www.mcgalaxy.ml");
return;
}
if (Server.gcipbans.TryGetValue(p.ip, out reason)) {
Player.SendMessage(p, "Your IP is %cBANNED" + Server.DefaultColor + " from%G Global Chat" + Server.DefaultColor + " by " + reason);
Player.SendMessage(p, "You can apply a 'Ban Appeal' at %9www.mcgalaxy.ml");
return;
}
} //Server.GlobalChat.Say((p != null ? p.name + ": " : "Console: ") + message, p);
Server.GlobalChat.Say(p == null ? "Console: " + message : p.name + ": " + message, p);
Player.GlobalMessage("%G<[Global] " + (p != null ? p.name + ": " : "Console: ") + "&f" + (Server.profanityFilter ? ProfanityFilter.Parse(message) : message), true);

37
Commands/Moderation/CmdLimit.cs
View File

@ -37,19 +37,35 @@ namespace MCGalaxy.Commands {
switch (args[0].ToLower()) {
case "rt":
case "reloadthreshold":
Player.GlobalMessage("Threshold before drawing reloads map changed to &b" + limit);
Server.DrawReloadLimit = limit; return;
Player.GlobalMessage("Threshold before drawing reloads map set to &b" + limit);
Server.DrawReloadLimit = limit;
SrvProperties.Save(); return;
case "rp":
case "restartphysics":
Player.GlobalMessage("Custom /rp's limit was changed to &b" + limit);
Server.rpLimit = limit; return;
Server.rpLimit = limit;
SrvProperties.Save(); return;
case "rpnormal":
Player.GlobalMessage("Normal /rp's limit was changed to &b" + limit);
Server.rpNormLimit = limit; return;
Player.GlobalMessage("Normal /rp's limit set to &b" + limit);
Server.rpNormLimit = limit;
SrvProperties.Save(); return;
case "pu":
case "physicsundo":
Player.GlobalMessage("Physics undo max entries was changed to &b" + limit);
Server.physUndo = limit; return;
Player.GlobalMessage("Physics undo max entries set to &b" + limit);
Server.physUndo = limit;
SrvProperties.Save(); return;
case "gen":
case "genlimit":
Player.GlobalMessage("Maximum volume of maps players can generate set to &b" + limit);
Server.MapGenLimit = limit;
SrvProperties.Save(); return;
case "genadmin":
case "genadminlimit":
case "admingen":
case "admingenlimit":
Player.GlobalMessage("Maximum volume of maps admins can generate set to &b" + limit);
Server.MapGenLimitAdmin = limit;
SrvProperties.Save(); return;
}
if (args.Length == 2) { Player.SendMessage(p, "You need to provide a rank name for this type."); return; }
@ -59,11 +75,11 @@ namespace MCGalaxy.Commands {
switch (args[0].ToLower()) {
case "dl":
case "drawlimit":
Player.GlobalMessage(grp.color + grp.name + "%S's draw limit was set to &b" + limit);
Player.GlobalMessage(grp.color + grp.name + "%S's draw limit set to &b" + limit);
grp.maxBlocks = limit; break;
case "mu":
case "maxundo":
Player.GlobalMessage(grp.color + grp.name + "%S's undo limit was set to &b" + limit);
Player.GlobalMessage(grp.color + grp.name + "%S's undo limit set to &b" + limit);
grp.maxUndo = limit; break;
default:
Help(p); return;
@ -74,7 +90,8 @@ namespace MCGalaxy.Commands {
public override void Help(Player p) {
Player.SendMessage(p, "/limit <type> <amount> [rank] - Sets the limit for <type>");
Player.SendMessage(p, "Valid types: reloadthreshold(rt), restartphysics(rp), " +
"rpnormal, physicsundo(pu), drawlimit(dl), maxundo(mu)");
"rpnormal, physicsundo(pu), drawlimit(dl), maxundo(mu), genlimit(gen), " +
"admingenlimit(admingen)");
Player.SendMessage(p, "Rank is required for drawlimit and maxundo types.");
}
}

11
Commands/World/CmdNewLvl.cs
View File

@ -60,10 +60,13 @@ namespace MCGalaxy.Commands
}
if (p != null) {
int limit = p.group.Permission < LevelPermission.Admin ? 30000000 : 225000000;
if (x * y * z > limit ) {
string text = String.Format("Cannot create a map with over {0} million blocks",
limit / 1000000);
int limit = p.group.Permission < LevelPermission.Admin ?
Server.MapGenLimit : Server.MapGenLimitAdmin;
if ((long)x * y * z > limit ) {
string text = "You cannot create a map with over ";
if (limit > 1000 * 1000) text += (limit / (1000 * 1000)) + " million blocks";
else if (limit > 1000) text += (limit / 1000) + " thousand blocks";
else text += limit + " blocks";
Player.SendMessage(p, text); return;
}
}

2
Commands/World/CmdTexture.cs
View File

@ -90,7 +90,7 @@ namespace MCGalaxy.Commands {
if (hasExt && url == "")
pl.SendCurrentMapAppearance();
}
SrvProperties.Save("properties/server.properties");
SrvProperties.Save();
}
void UpdateLevel(Player p, bool zip) {

3
Commands/other/CmdServer.cs
View File

@ -163,7 +163,6 @@ namespace MCGalaxy.Commands
Server.afkset = new List<string>();
Server.ircafkset = new List<string>();
Server.afkmessages = new List<string>();
Server.messages = new List<string>();
Server.restartcountdown = "";
@ -256,6 +255,8 @@ namespace MCGalaxy.Commands
Server.notifyOnJoinLeave = false;
Server.repeatMessage = false;
Server.DrawReloadLimit = 10000;
Server.MapGenLimit = 30 * 1000 * 1000;
Server.MapGenLimitAdmin = 225 * 1000 * 1000;
Server.checkUpdates = true;

12
Server/Properties.cs
View File

@ -551,6 +551,14 @@ namespace MCGalaxy {
try { Server.DrawReloadLimit = int.Parse(value); }
catch { Server.s.Log("Invalid " + key + ". Using default"); Server.DrawReloadLimit = 10000; }
break;
case "map-gen-limit":
try { Server.MapGenLimit = int.Parse(value); }
catch { Server.s.Log("Invalid " + key + ". Using default"); Server.MapGenLimit = 30 * 1000 * 1000; }
break;
case "map-gen-limit-admin":
try { Server.MapGenLimitAdmin = int.Parse(value); }
catch { Server.s.Log("Invalid " + key + ". Using default"); Server.MapGenLimitAdmin = 225 * 1000 * 1000; }
break;
case "review-view-perm":
try {
@ -640,6 +648,8 @@ namespace MCGalaxy {
}
} return true;
}
public static void Save() { Save("properties/server.properties"); }
public static void Save(string givenPath) {
try {
@ -817,6 +827,8 @@ namespace MCGalaxy {
w.WriteLine("total-undo = " + Server.totalUndo);
w.WriteLine("physics-undo-max = " + Server.physUndo);
w.WriteLine("draw-reload-limit = " + Server.DrawReloadLimit);
w.WriteLine("map-gen-limit = " + Server.MapGenLimit);
w.WriteLine("map-gen-limit-admin = " + Server.MapGenLimitAdmin);
w.WriteLine();
w.WriteLine("# backup options");
w.WriteLine("backup-time = " + Server.backupInterval.ToString());

23
Server/Server.cs
View File

@ -77,11 +77,10 @@ namespace MCGalaxy
public static Version Version { get { return System.Reflection.Assembly.GetAssembly(typeof(Server)).GetName().Version; } }
public static string VersionString
{
get
{
return Version.Major + "." + Version.Minor + "." + Version.Build;
public static string VersionString {
get {
Version v = Version;
return v.Major + "." + v.Minor + "." + v.Build;
}
}
@ -93,13 +92,7 @@ namespace MCGalaxy
public static System.Timers.Timer updateTimer = new System.Timers.Timer(100);
//static System.Timers.Timer heartbeatTimer = new System.Timers.Timer(60000); //Every 45 seconds
static System.Timers.Timer messageTimer = new System.Timers.Timer(60000 * 5); //Every 5 mins
public static System.Timers.Timer cloneTimer = new System.Timers.Timer(5000);
//public static Thread physThread;
//public static bool physPause;
//public static DateTime physResume = DateTime.Now;
//public static System.Timers.Timer physTimer = new System.Timers.Timer(1000);
// static Thread botsThread;
//Chatrooms
public static List<string> Chatrooms = new List<string>();
//Other
@ -136,17 +129,11 @@ namespace MCGalaxy
public static List<string> reviewlist = new List<string>();
//Global Chat Rules Accepted list
public static List<string> gcaccepted = new List<string>();
//public static List<levelID> allLevels = new List<levelID>();
public struct levelID { public int ID; public string name; }
public static List<string> afkset = new List<string>();
public static List<string> ircafkset = new List<string>();
public static List<string> afkmessages = new List<string>();
public static List<string> messages = new List<string>();
public static Dictionary<string, string> gcnamebans = new Dictionary<string, string>();
public static Dictionary<string, string> gcipbans = new Dictionary<string, string>();
public static DateTime timeOnline;
public static string IP;
//auto updater stuff
@ -351,6 +338,8 @@ namespace MCGalaxy
public static LevelPermission reviewclear = LevelPermission.Operator;
public static int DrawReloadLimit = 10000;
public static int MapGenLimitAdmin = 225 * 1000 * 1000;
public static int MapGenLimit = 30 * 1000 * 1000;
#endregion
public static MainLoop ml;