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

gb/lb copyall should keep inventory order

Browse Source
This commit is contained in:
UnknownShadow200 2018-04-06 17:56:09 +10:00
parent 69b0f96149
commit 67916054f7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MCGalaxy/Commands/CPE/CustomBlockCommand.cs
View File

@ -127,7 +127,7 @@ namespace MCGalaxy.Commands.CPE {
if (defs[i] == null) continue; if (defs[i] == null) continue;
BlockID b = (BlockID)i; BlockID b = (BlockID)i;
if (!DoCopy(p, global, cmd, defs[i], b, b)) continue; if (!DoCopy(p, global, cmd, true, defs[i], b, b)) continue;
copied++; copied++;
string scope = global ? "global" : "level"; string scope = global ? "global" : "level";
@ -147,14 +147,15 @@ namespace MCGalaxy.Commands.CPE {
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs; BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
BlockDefinition srcDef = defs[src]; BlockDefinition srcDef = defs[src];
if (!DoCopy(p, global, cmd, srcDef, src, dst)) return; if (!DoCopy(p, global, cmd, false, srcDef, src, dst)) return;
string scope = global ? "global" : "level"; string scope = global ? "global" : "level";
Player.Message(p, "Duplicated the {0} custom block with id \"{1}\" to \"{2}\".", scope, Player.Message(p, "Duplicated the {0} custom block with id \"{1}\" to \"{2}\".", scope,
Block.ToRaw(src), Block.ToRaw(dst)); Block.ToRaw(src), Block.ToRaw(dst));
} }
static bool DoCopy(Player p, bool global, string cmd, BlockDefinition srcDef, BlockID src, BlockID dst) { static bool DoCopy(Player p, bool global, string cmd, bool keepOrder,
BlockDefinition srcDef, BlockID src, BlockID dst) {
if (srcDef == null && src < Block.CpeCount) { if (srcDef == null && src < Block.CpeCount) {
srcDef = DefaultSet.MakeCustomBlock(src); srcDef = DefaultSet.MakeCustomBlock(src);
} }
@ -167,7 +168,7 @@ namespace MCGalaxy.Commands.CPE {
BlockProps props = global ? Block.Props[src] : p.level.Props[src]; BlockProps props = global ? Block.Props[src] : p.level.Props[src];
dstDef = srcDef.Copy(); dstDef = srcDef.Copy();
dstDef.SetBlock(dst); dstDef.SetBlock(dst);
dstDef.InventoryOrder = -1; if (!keepOrder) dstDef.InventoryOrder = -1;
AddBlock(p, dstDef, global, cmd, props); AddBlock(p, dstDef, global, cmd, props);
return true; return true;