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

Don't allow replacing air with gb/lb

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-28 14:55:47 +10:00
parent efa47e46d7
commit 68b1e0835a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ namespace MCGalaxy.Commands.CPE {
static void CopyHandler(Player p, string[] parts, bool global, string cmd) { static void CopyHandler(Player p, string[] parts, bool global, string cmd) {
if (parts.Length <= 2) { Help(p, cmd); return; } if (parts.Length <= 2) { Help(p, cmd); return; }
ExtBlock src, dst; ExtBlock src, dst;
if (!CheckBlock(p, parts[1], out src)) return; if (!CheckBlock(p, parts[1], out src, true)) return;
if (!CheckBlock(p, parts[2], out dst)) return; if (!CheckBlock(p, parts[2], out dst)) return;
BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs; BlockDefinition[] defs = global ? BlockDefinition.GlobalDefs : p.level.CustomBlockDefs;
@ -535,10 +535,11 @@ namespace MCGalaxy.Commands.CPE {
return true; return true;
} }
static bool CheckBlock(Player p, string arg, out ExtBlock block) { static bool CheckBlock(Player p, string arg, out ExtBlock block, bool allowAir = false) {
block = ExtBlock.Invalid; block = ExtBlock.Invalid;
int raw = 0; int raw = 0;
bool success = CommandParser.GetInt(p, arg, "Block ID", ref raw, 0, 254); int min = allowAir ? 0 : 1;
bool success = CommandParser.GetInt(p, arg, "Block ID", ref raw, min, 254);
block = ExtBlock.FromRaw((byte)raw); block = ExtBlock.FromRaw((byte)raw);
return success; return success;