summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockRail.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-19 15:52:45 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-19 15:52:45 +0100
commit8467f5dfaea596a0b7e294cf1b7dce224c41d7b9 (patch)
tree7e8579f17f71a22a5bc957a9712b629c55c870cc /src/Blocks/BlockRail.h
parentMerge remote-tracking branch 'origin/master' into minecartimprovements (diff)
downloadcuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar.gz
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar.bz2
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar.lz
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar.xz
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.tar.zst
cuberite-8467f5dfaea596a0b7e294cf1b7dce224c41d7b9.zip
Diffstat (limited to 'src/Blocks/BlockRail.h')
-rw-r--r--src/Blocks/BlockRail.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h
index 55cadfa48..f13e987b7 100644
--- a/src/Blocks/BlockRail.h
+++ b/src/Blocks/BlockRail.h
@@ -204,7 +204,7 @@ public:
bool IsUnstable(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ)
{
- if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_RAIL)
+ if (!IsBlockRail(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ)))
{
return false;
}
@@ -339,11 +339,11 @@ public:
{
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false);
NIBBLETYPE Meta;
- if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_RAIL)
+ if (!IsBlockRail(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ)))
{
- if ((a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ) != E_BLOCK_RAIL) || (a_Pure != E_PURE_UPDOWN))
+ if (!IsBlockRail(a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ)) || (a_Pure != E_PURE_UPDOWN))
{
- if ((a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) != E_BLOCK_RAIL) || (a_Pure == E_PURE_NONE))
+ if (!IsBlockRail(a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)) || (a_Pure == E_PURE_NONE))
{
return true;
}