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 /lb copy not cloning globally defined custom blocks, fix /lb edit blockslight inverting true/false. (Thanks goodlyay)

Browse Source
This commit is contained in:
UnknownShadow200 2016-06-15 21:24:20 +10:00
parent 0d80d571e4
commit 6e71652370
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Commands/CPE/CustomBlockCommand.cs
View File

@ -110,15 +110,16 @@ namespace MCGalaxy.Commands.CPE {
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs; BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
BlockDefinition src = defs[srcId], dst = defs[dstId]; BlockDefinition src = defs[srcId], dst = defs[dstId];
if (!ExistsInScope(src, srcId, global)) { MessageNoBlock(p, srcId, global, cmd); return; } if (defs[srcId] == null) { MessageNoBlock(p, srcId, global, cmd); return; }
if (ExistsInScope(dst, dstId, global)) { MessageAlreadyBlock(p, dstId, global, cmd); return; } if (ExistsInScope(dst, dstId, global)) { MessageAlreadyBlock(p, dstId, global, cmd); return; }
dst = src.Copy(); dst = src.Copy();
dst.BlockID = (byte)dstId; dst.BlockID = (byte)dstId;
BlockDefinition.Add(dst, defs, p == null ? null : p.level); BlockDefinition.Add(dst, defs, p == null ? null : p.level);
string scope = global ? "global" : "level";
Player.Message(p, "Duplicated the " + scope + " custom block " + bool globalBlock = defs[srcId] == BlockDefinition.GlobalDefs[srcId];
"with id \"" + srcId + "\" to \"" + dstId + "\"."); string scope = globalBlock ? "global" : "level";
Player.Message(p, "Duplicated the {0} custom block with id \"{1}\" to \"{2}\".", scope, srcId, dstId);
} }
static bool ExistsInScope(BlockDefinition def, int i, bool global) { static bool ExistsInScope(BlockDefinition def, int i, bool global) {
@ -369,7 +370,7 @@ namespace MCGalaxy.Commands.CPE {
if( !(value == "0" || value == "1")) { if( !(value == "0" || value == "1")) {
SendEditHelp(p, 8, 0); return; SendEditHelp(p, 8, 0); return;
} }
def.BlocksLight = value == "0"; break; def.BlocksLight = value != "0"; break;
case "sound": case "sound":
case "walksound": case "walksound":
if (!EditByte(p, value, "Walk sound", ref def.WalkSound, 9, 1, 0, 11)) return; if (!EditByte(p, value, "Walk sound", ref def.WalkSound, 9, 1, 0, 11)) return;
@ -465,7 +466,7 @@ namespace MCGalaxy.Commands.CPE {
static void MessageNoBlock(Player p, int id, bool global, string cmd) { static void MessageNoBlock(Player p, int id, bool global, string cmd) {
string scope = global ? "global" : "level"; string scope = global ? "global" : "level";
Player.Message(p, "There is no {1} custom block with the id \"{0}\".", id, scope); Player.Message(p, "There is no {1} custom block with the id \"{0}\".", id, scope);
Player.Message(p, "Type \"%T{0}list\" %Sto see a list of {1} custom blocks.", cmd, scope); Player.Message(p, "Type \"%T{0} list\" %Sto see a list of {1} custom blocks.", cmd, scope);
} }
static void MessageAlreadyBlock(Player p, int id, bool global, string cmd) { static void MessageAlreadyBlock(Player p, int id, bool global, string cmd) {