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

Allow /copy cut air (Thanks StarlightGlimmer)

Browse Source
This commit is contained in:
UnknownShadow200 2017-12-12 18:43:20 +11:00
parent a15b3aeccd
commit b982fa9efb
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MCGalaxy/Commands/building/CmdCopy.cs
View File

@ -70,20 +70,23 @@ namespace MCGalaxy.Commands.Building {
Player.Message(p, Path.GetFileNameWithoutExtension(files[i])); Player.Message(p, Path.GetFileNameWithoutExtension(files[i]));
} }
} else { } else {
HandleOther(p, opt, parts, offsetIndex); HandleOther(p, parts, offsetIndex);
} }
} }
void HandleOther(Player p, string opt, string[] parts, int offsetIndex) { void HandleOther(Player p, string[] parts, int offsetIndex) {
CopyArgs cArgs = new CopyArgs(); CopyArgs cArgs = new CopyArgs();
cArgs.offsetIndex = offsetIndex; cArgs.offsetIndex = offsetIndex;
if (opt == "cut") { for (int i = 0; i < parts.Length; i++) {
cArgs.type = 1; string opt = parts[i];
} else if (opt == "air") { if (opt.CaselessEq("cut")) {
cArgs.type = 2; cArgs.cut = true;
} else if (!String.IsNullOrEmpty(opt)) { } else if (opt.CaselessEq("air")) {
Help(p); return; cArgs.air = true;
} else if (opt.Length > 0) {
Help(p);
}
} }
Player.Message(p, "Place or break two blocks to determine the edges."); Player.Message(p, "Place or break two blocks to determine the edges.");
@ -112,7 +115,7 @@ namespace MCGalaxy.Commands.Building {
cState.OriginX = m[0].X; cState.OriginY = m[0].Y; cState.OriginZ = m[0].Z; cState.OriginX = m[0].X; cState.OriginY = m[0].Y; cState.OriginZ = m[0].Z;
int index = 0; cState.UsedBlocks = 0; int index = 0; cState.UsedBlocks = 0;
cState.PasteAir = cArgs.type == 2; cState.PasteAir = cArgs.air;
for (ushort y = minY; y <= maxY; ++y) for (ushort y = minY; y <= maxY; ++y)
for (ushort z = minZ; z <= maxZ; ++z) for (ushort z = minZ; z <= maxZ; ++z)
@ -137,7 +140,7 @@ namespace MCGalaxy.Commands.Building {
cState.CopySource = "level " + p.level.name; cState.CopySource = "level " + p.level.name;
p.SetCurrentCopy(cState); p.SetCurrentCopy(cState);
if (cArgs.type == 1) { if (cArgs.cut) {
DrawOp op = new CuboidDrawOp(); DrawOp op = new CuboidDrawOp();
op.Flags = BlockDBFlags.Cut; op.Flags = BlockDBFlags.Cut;
Brush brush = new SolidBrush(ExtBlock.Air); Brush brush = new SolidBrush(ExtBlock.Air);
@ -157,7 +160,7 @@ namespace MCGalaxy.Commands.Building {
} }
bool DoCopy(Player p, Vec3S32[] m, object state, ExtBlock block) { return false; } bool DoCopy(Player p, Vec3S32[] m, object state, ExtBlock block) { return false; }
class CopyArgs { public int type, offsetIndex; } class CopyArgs { public int offsetIndex; public bool cut, air; }
void SaveCopy(Player p, string file) { void SaveCopy(Player p, string file) {
if (!Directory.Exists("extra/savecopy")) if (!Directory.Exists("extra/savecopy"))