summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockRedstoneRepeater.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-19 22:14:37 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-19 22:14:37 +0200
commitb5ffe06f884221f98407910bdd30baf533d84970 (patch)
tree6f7768641979fa5f57525eb98e8a7e37b71bfe06 /src/Blocks/BlockRedstoneRepeater.h
parentPlayer: Silenced a few type conversion warnings. (diff)
downloadcuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.gz
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.bz2
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.lz
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.xz
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.zst
cuberite-b5ffe06f884221f98407910bdd30baf533d84970.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockRedstoneRepeater.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
index 4c8a6a087..4b18add12 100644
--- a/src/Blocks/BlockRedstoneRepeater.h
+++ b/src/Blocks/BlockRedstoneRepeater.h
@@ -23,7 +23,7 @@ public:
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
int a_CursorX, int a_CursorY, int a_CursorZ,
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
- ) override
+ ) override
{
a_BlockType = m_BlockType;
a_BlockMeta = RepeaterRotationToMetaData(a_Player->GetYaw());
@@ -46,7 +46,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- // Reset meta to 0
+ // Reset meta to zero
a_Pickups.push_back(cItem(E_ITEM_REDSTONE_REPEATER, 1, 0));
}
@@ -59,7 +59,7 @@ public:
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{
- return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
+ return ((a_RelY > 0) && cBlockInfo::IsSolid(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
}