summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-28 01:29:19 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-28 01:29:19 +0200
commit0a20e19a64f88e66af68018cc46bc37dfdca7948 (patch)
tree109fee013a2682772387ed25a0e6be6249d361b0 /src
parentFixed bad water/redstone simulator communication (diff)
downloadcuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar.gz
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar.bz2
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar.lz
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar.xz
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.tar.zst
cuberite-0a20e19a64f88e66af68018cc46bc37dfdca7948.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockButton.h2
-rw-r--r--src/Blocks/BlockLever.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index 4b2f6f618..7d9af207d 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -102,7 +102,7 @@ public:
AddFaceDirection(a_RelX, a_RelY, a_RelZ, BlockMetaDataToBlockFace(Meta), true);
BLOCKTYPE BlockIsOn; a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, BlockIsOn);
- return (a_RelY > 0) && (cBlockInfo::IsSolid(BlockIsOn));
+ return (a_RelY > 0) && (cBlockInfo::FullyOccupiesVoxel(BlockIsOn));
}
} ;
diff --git a/src/Blocks/BlockLever.h b/src/Blocks/BlockLever.h
index f1d3ff6d2..afe43abf8 100644
--- a/src/Blocks/BlockLever.h
+++ b/src/Blocks/BlockLever.h
@@ -22,7 +22,7 @@ public:
// Flip the ON bit on/off using the XOR bitwise operation
NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x08);
- a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_LEVER, Meta); // SetMeta doesn't work for unpowering levers, so setblock
+ a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
a_WorldInterface.GetBroadcastManager().BroadcastSoundEffect("random.click", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 0.5f, (Meta & 0x08) ? 0.6f : 0.5f);
}
@@ -104,7 +104,7 @@ public:
AddFaceDirection(a_RelX, a_RelY, a_RelZ, BlockMetaDataToBlockFace(Meta), true);
BLOCKTYPE BlockIsOn; a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, BlockIsOn);
- return (a_RelY > 0) && cBlockInfo::IsSolid(BlockIsOn);
+ return (a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(BlockIsOn);
}