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

CommandParser.Getblock prefers raw ID, then names of custom blocks on level, then finally default/physics block names.

Browse Source
This commit is contained in:
UnknownShadow200 2018-01-10 18:18:36 +11:00
parent b7133ab193
commit e051a04099
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MCGalaxy/Commands/CommandParser.cs
View File

@ -180,14 +180,19 @@ namespace MCGalaxy.Commands {
/// <summary> Attempts to parse the given argument as either a block name or a block ID. </summary> /// <summary> Attempts to parse the given argument as either a block name or a block ID. </summary>
/// <remarks> This does not output any messages to the player. </remarks> /// <remarks> This does not output any messages to the player. </remarks>
public static ExtBlock RawGetBlock(Player p, string input) { public static ExtBlock RawGetBlock(Player p, string input) {
ExtBlock block = default(ExtBlock);
block.BlockID = Block.Byte(input);
if (!block.IsInvalid) return block;
// find custom block
BlockDefinition[] defs = p == null ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs; BlockDefinition[] defs = p == null ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
byte id;
// raw ID is treated specially, before names
if (byte.TryParse(input, out id) && (id < Block.CpeCount || defs[id] != null)) {
return ExtBlock.FromRaw(id);
}
int raw = BlockDefinition.GetBlock(input, defs); int raw = BlockDefinition.GetBlock(input, defs);
if (raw != -1) return ExtBlock.FromRaw((byte)raw); if (raw != -1) return ExtBlock.FromRaw((byte)raw);
id = Block.Byte(input);
if (id != Block.Invalid) return new ExtBlock(id, 0);
return ExtBlock.Invalid; return ExtBlock.Invalid;
} }