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

Fix /search blocks not including global blocks from console

Browse Source
This commit is contained in:
UnknownShadow200 2018-03-05 10:31:28 +11:00
parent a1c455994e
commit e6e92b7ecf
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,14 +496,14 @@ namespace MCGalaxy.Commands.CPE {
// Start from opposite ends to avoid overlap. // Start from opposite ends to avoid overlap.
if (global) { if (global) {
BlockDefinition[] defs = BlockDefinition.GlobalDefs; BlockDefinition[] defs = BlockDefinition.GlobalDefs;
for (int b = Block.CpeCount; b < Block.Invalid; b++) { for (BlockID b = Block.CpeCount; b < Block.Invalid; b++) {
BlockID block = Block.FromRaw((BlockRaw)b); BlockID block = Block.FromRaw(b);
if (defs[block] == null) return block; if (defs[block] == null) return block;
} }
} else { } else {
BlockDefinition[] defs = lvl.CustomBlockDefs; BlockDefinition[] defs = lvl.CustomBlockDefs;
for (int b = Block.Invalid - 1; b >= Block.CpeCount; b--) { for (BlockID b = Block.Invalid - 1; b >= Block.CpeCount; b--) {
BlockID block = Block.FromRaw((BlockRaw)b); BlockID block = Block.FromRaw(b);
if (defs[block] == null) return block; if (defs[block] == null) return block;
} }
} }

2
MCGalaxy/Commands/Information/CmdBlocks.cs
View File

@ -61,7 +61,7 @@ namespace MCGalaxy.Commands.Info {
static List<BlockID> BasicBlocks() { static List<BlockID> BasicBlocks() {
List<BlockID> blocks = new List<BlockID>(Block.CpeCount); List<BlockID> blocks = new List<BlockID>(Block.CpeCount);
for (BlockID block = 0; block < Block.CpeCount; block++) { for (BlockID block = Block.Air; block < Block.CpeCount; block++) {
blocks.Add(block); blocks.Add(block);
} }
return blocks; return blocks;

15
MCGalaxy/Commands/Information/CmdSearch.cs
View File

@ -54,15 +54,14 @@ namespace MCGalaxy.Commands.Info {
static void SearchBlocks(Player p, string keyword, string modifier) { static void SearchBlocks(Player p, string keyword, string modifier) {
List<BlockID> blocks = new List<BlockID>(); List<BlockID> blocks = new List<BlockID>();
for (BlockID block = 0; block < Block.Count; block++) { BlockDefinition[] defs = Player.IsSuper(p) ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
if (!Block.Undefined(block)) blocks.Add(block);
}
if (!Player.IsSuper(p)) { for (int b = 0; b < Block.ExtendedCount; b++) {
for (int b = Block.CpeCount; b < Block.Count; b++) { BlockID block = (BlockID)b;
BlockID block = Block.FromRaw((BlockRaw)b); if (Block.IsPhysicsType(block)) {
if (p.level.CustomBlockDefs[block] == null) continue; if (!Block.Undefined(block)) blocks.Add(block);
blocks.Add(block); } else {
if (defs[block] != null) blocks.Add(block);
} }
} }