diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-25 01:22:31 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-25 01:22:31 +0200 |
| commit | 6fbc98def25d1b9b23a3a416197dc53a39ca7620 (patch) | |
| tree | b222b7613f75eaf40f8f3f91facbcb78ddfe0bef | |
| parent | Merge pull request #1565 from mc-server/MergedIniFile (diff) | |
| download | cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar.gz cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar.bz2 cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar.lz cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar.xz cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.tar.zst cuberite-6fbc98def25d1b9b23a3a416197dc53a39ca7620.zip | |
| -rw-r--r-- | src/Blocks/BlockPressurePlate.h | 3 | ||||
| -rw-r--r-- | src/Blocks/BlockRail.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Blocks/BlockPressurePlate.h b/src/Blocks/BlockPressurePlate.h index a5c34a776..bd2f283a2 100644 --- a/src/Blocks/BlockPressurePlate.h +++ b/src/Blocks/BlockPressurePlate.h @@ -28,8 +28,7 @@ public: return false; } - BLOCKTYPE BlockBelow = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ); - return (cBlockInfo::IsSolid(BlockBelow)); + return (cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))); } } ; diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h index 87ce069ab..533a6e900 100644 --- a/src/Blocks/BlockRail.h +++ b/src/Blocks/BlockRail.h @@ -98,7 +98,7 @@ public: { return false; } - if (!cBlockInfo::IsSolid(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))) + if (!cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))) { return false; } @@ -130,7 +130,7 @@ public: // Too close to the edge, cannot simulate return true; } - return cBlockInfo::IsSolid(BlockType); + return cBlockInfo::FullyOccupiesVoxel(BlockType); } } return true; |