diff options
author | Mattes D <github@xoft.cz> | 2015-03-14 22:44:04 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2015-03-14 22:44:04 +0100 |
commit | 65d2ef32e920580ab5408bd1e2fcb3da42c8eec1 (patch) | |
tree | bfbef765d31cf6b78490f013dad5d600e785195e /src/Blocks/BlockBed.h | |
parent | Merge pull request #1808 from tumultenrx/master (diff) | |
parent | Reverted non-functional changes (diff) | |
download | cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar.gz cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar.bz2 cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar.lz cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar.xz cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.tar.zst cuberite-65d2ef32e920580ab5408bd1e2fcb3da42c8eec1.zip |
Diffstat (limited to 'src/Blocks/BlockBed.h')
-rw-r--r-- | src/Blocks/BlockBed.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h index 5b746110a..46f361686 100644 --- a/src/Blocks/BlockBed.h +++ b/src/Blocks/BlockBed.h @@ -4,9 +4,9 @@ #include "BlockHandler.h" #include "MetaRotator.h" #include "Item.h" +#include "ChunkInterface.h" -class cChunkInterface; class cPlayer; class cWorldInterface; @@ -21,17 +21,14 @@ public: : cMetaRotator<cBlockHandler, 0x3, 0x02, 0x03, 0x00, 0x01, true>(a_BlockType) { } - - + virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override; virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override; - virtual bool IsUseable(void) override { return true; } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { @@ -39,14 +36,12 @@ public: a_Pickups.push_back(cItem(E_ITEM_BED, 1, 0)); } - virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override { return true; } - // Bed specific helper functions static NIBBLETYPE RotationToMetaData(double a_Rotation) { @@ -61,7 +56,6 @@ public: return ((char)a_Rotation + 2) % 4; } - static Vector3i MetaDataToDirection(NIBBLETYPE a_MetaData) { switch (a_MetaData) @@ -73,6 +67,21 @@ public: } return Vector3i(); } + + static void SetBedOccupationState(cChunkInterface & a_ChunkInterface, const Vector3i & a_BedPosition, bool a_IsOccupied) + { + auto Meta = a_ChunkInterface.GetBlockMeta(a_BedPosition.x, a_BedPosition.y, a_BedPosition.z); + if (a_IsOccupied) + { + Meta |= 0x04; // Where 0x4 = occupied bit + } + else + { + Meta &= 0x0b; // Clear the "occupied" bit of the bed's block + } + + a_ChunkInterface.SetBlockMeta(a_BedPosition.x, a_BedPosition.y, a_BedPosition.z, Meta); + } } ; |