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 physics blocks not returning BlockDefinition instance if the core block was changed to non-solid, fixes ZS noclip detection being triggered.

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-25 22:03:17 +10:00
parent 8d1a73756d
commit d7f759c837
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MCGalaxy/Commands/Moderation/CmdZone.cs
View File

@ -68,8 +68,7 @@ namespace MCGalaxy.Commands.Moderation {
} }
} else if (args[0].CaselessEq("list")) { } else if (args[0].CaselessEq("list")) {
string modifier = args.Length > 1 ? args[1] : ""; string modifier = args.Length > 1 ? args[1] : "";
MultiPageOutput.Output(p, p.level.ZoneList, FormatZone, MultiPageOutput.Output(p, p.level.ZoneList, FormatZone, "zone list", "zones", modifier, true);
"zone list", "zones", modifier, true);
} else { } else {
Help(p); Help(p);
} }

10
MCGalaxy/Levels/Level.Blocks.cs
View File

@ -442,12 +442,16 @@ namespace MCGalaxy {
if (buffered) BlockQueue.Addblock(p, index, block); if (buffered) BlockQueue.Addblock(p, index, block);
else Player.GlobalBlockchange(this, x, y, z, block); else Player.GlobalBlockchange(this, x, y, z, block);
} }
public BlockDefinition GetBlockDef(ExtBlock block) { public BlockDefinition GetBlockDef(ExtBlock block) {
if (block.BlockID == Block.custom_block) return CustomBlockDefs[block.ExtID]; if (block.BlockID == Block.custom_block) return CustomBlockDefs[block.ExtID];
if (block.BlockID >= Block.CpeCount || block.BlockID == Block.Air) return null; if (block.BlockID == Block.Air) return null;
return CustomBlockDefs[block.BlockID];
if (block.BlockID >= Block.CpeCount) {
return CustomBlockDefs[Block.Convert(block.BlockID)];
} else {
return CustomBlockDefs[block.BlockID];
}
} }
public string BlockName(ExtBlock block) { public string BlockName(ExtBlock block) {