AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /os map add keeping level in memory. Addresses #316.

Browse Source
This commit is contained in:
UnknownShadow200 2017-06-13 18:09:32 +10:00
parent 163638e8b5
commit 943ff0d8d5
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
MCGalaxy/Commands/World/CmdNewLvl.cs
View File

@ -30,44 +30,54 @@ namespace MCGalaxy.Commands.World {
get { return new[] { new CommandPerm(LevelPermission.Admin, "+ can generate maps with advanced themes") }; }
}
public override void Use(Player p, string message) { GenerateMap(p, message); }
internal bool GenerateMap(Player p, string message) {
public override void Use(Player p, string message) {
string[] args = message.SplitSpaces();
if (args.Length < 5 || args.Length > 6) { Help(p); return false; }
if (!MapGen.IsRecognisedTheme(args[4])) { MapGen.PrintThemes(p); return false; }
if (args.Length < 5 || args.Length > 6) { Help(p); return; }
Level lvl = null;
try {
lvl = GenerateMap(p, args);
if (lvl == null) return;
lvl.Save(true);
} finally {
if (lvl != null) lvl.Dispose();
Server.DoGC();
}
}
internal Level GenerateMap(Player p, string[] args) {
if (args.Length < 5) return null;
if (!MapGen.IsRecognisedTheme(args[4])) { MapGen.PrintThemes(p); return null; }
ushort x = 0, y = 0, z = 0;
string name = args[0].ToLower();
if (!CheckMapAxis(p, args[1], "Width", ref x)) return false;
if (!CheckMapAxis(p, args[2], "Height", ref y)) return false;
if (!CheckMapAxis(p, args[3], "Length", ref z)) return false;
if (!CheckMapVolume(p, x, y, z)) return true;
if (!CheckMapAxis(p, args[1], "Width", ref x)) return null;
if (!CheckMapAxis(p, args[2], "Height", ref y)) return null;
if (!CheckMapAxis(p, args[3], "Length", ref z)) return null;
if (!CheckMapVolume(p, x, y, z)) return null;
string seed = args.Length == 6 ? args[5] : "";
if (!Formatter.ValidName(p, name, "level")) return false;
if (!Formatter.ValidName(p, name, "level")) return null;
if (LevelInfo.MapExists(name)) {
Player.Message(p, "Level \"{0}\" already exists", name); return false;
Player.Message(p, "Level \"{0}\" already exists", name); return null;
}
if (!MapGen.IsSimpleTheme(args[4]) && !CheckExtraPerm(p)) {
MessageNeedExtra(p, 1); return false;
MessageNeedExtra(p, 1); return null;
}
if (p != null && Interlocked.CompareExchange(ref p.GeneratingMap, 1, 0) == 1) {
Player.Message(p, "You are already generating a map, please wait until that map has finished generating first.");
return false;
return null;
}
Level lvl;
try {
Player.Message(p, "Generating map \"{0}\"..", name);
using (Level lvl = new Level(name, x, y, z)) {
if (!MapGen.Generate(lvl, args[4], seed, p)) return false;
lvl.Save(true);
lvl.Dispose();
name = lvl.ColoredName;
}
lvl = new Level(name, x, y, z);
if (!MapGen.Generate(lvl, args[4], seed, p)) { lvl.Dispose(); return null; }
name = lvl.ColoredName;
string format = seed != "" ? "{0}%S created level {1}%S with seed \"{2}\"" : "{0}%S created level {1}";
string pName = p == null ? "(console)" : p.ColoredName;
Chat.MessageGlobal(format, pName, name, seed);
@ -75,7 +85,7 @@ namespace MCGalaxy.Commands.World {
if (p != null) Interlocked.Exchange(ref p.GeneratingMap, 0);
Server.DoGC();
}
return true;
return lvl;
}

22
MCGalaxy/Commands/World/CmdOverseer.SubCommands.cs
View File

@ -152,24 +152,32 @@ namespace MCGalaxy.Commands.World {
if (args.Length == 3) value += " flat";
CmdNewLvl newLvl = (CmdNewLvl)Command.all.Find("newlvl"); // TODO: this is a nasty hack, find a better way
if (!newLvl.GenerateMap(p, level + " " + value)) return;
// Set default perbuild permissions
CmdLoad.LoadLevel(null, level);
Level lvl = LevelInfo.FindExact(level);
args = (level + " " + value).SplitSpaces();
Level lvl = newLvl.GenerateMap(p, args);
if (lvl == null) return;
SetBuildPerms(p, lvl);
try {
lvl.Save(true);
} finally {
lvl.Dispose();
Server.DoGC();
}
}
static void SetBuildPerms(Player p, Level lvl) {
lvl.RealmOwner = p.name;
Command.all.Find("perbuild").Use(null, lvl.name + " +" + p.name);
lvl.BuildAccess.Whitelist(null, p.name);
CmdZone.ZoneAll(lvl, p.name);
LevelPermission osPerm = Server.osPerbuildDefault;
if (osPerm == LevelPermission.Nobody)
osPerm = CommandPerms.MinPerm(Command.all.Find("overseer"));
Group grp = Group.findPerm(osPerm);
if (grp == null) return;
Command.all.Find("perbuild").Use(null, lvl.name + " " + grp.name);
lvl.BuildAccess.SetMin(null, grp);
Player.Message(p, "Use %T/os zone add [name] %Sto allow " +
"players ranked below " + grp.ColoredName + " %Sto build in the map.");
}