summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2016-06-05 17:08:47 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2016-07-29 00:20:52 +0200
commit04cc8aa0f57ac3fb3293740d4ffd741231d5925d (patch)
tree014a1bc9552f182c958595a69e1ae2afbd860796 /src/Blocks
parentTab completion across worlds (#3270) (diff)
downloadcuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar.gz
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar.bz2
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar.lz
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar.xz
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.tar.zst
cuberite-04cc8aa0f57ac3fb3293740d4ffd741231d5925d.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockComparator.h5
-rw-r--r--src/Blocks/BlockPiston.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index 394b53a15..ffd1bde61 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -60,6 +60,11 @@ public:
return true;
}
+ inline static bool IsOn(NIBBLETYPE a_Meta)
+ {
+ return ((a_Meta & 0x8) == 0x8);
+ }
+
inline static Vector3i GetSideCoordinate(const Vector3i & a_Position, NIBBLETYPE a_Meta, bool a_bInverse)
{
auto Position = a_Position;
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 30ccc168d..18b688256 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -93,6 +93,9 @@ public:
return 11;
}
+ /** Returns true if the piston (with the specified meta) is extended */
+ static inline bool IsExtended(NIBBLETYPE a_PistonMeta) { return ((a_PistonMeta & 0x8) != 0x0); }
+
private:
typedef std::unordered_set<Vector3i, VectorHasher<int>> Vector3iSet;
@@ -100,9 +103,6 @@ private:
/** Returns true if the piston (specified by blocktype) is a sticky piston */
static inline bool IsSticky(BLOCKTYPE a_BlockType) { return (a_BlockType == E_BLOCK_STICKY_PISTON); }
- /** Returns true if the piston (with the specified meta) is extended */
- static inline bool IsExtended(NIBBLETYPE a_PistonMeta) { return ((a_PistonMeta & 0x8) != 0x0); }
-
/** Returns true if the specified block can be pushed by a piston (and left intact) */
static inline bool CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{