diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-02-01 00:17:41 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-02-01 00:17:41 +0100 |
| commit | 25ec7750aac9800bec83a844020a6eeda5cd4d74 (patch) | |
| tree | 1820a0856969583238d85b2a68d299e55807f951 /src/Blocks/BlockChest.h | |
| parent | Changed it so std was actually set to c++11 in clang not gcc on OS X (diff) | |
| download | cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.gz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.bz2 cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.lz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.xz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.zst cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.zip | |
Diffstat (limited to 'src/Blocks/BlockChest.h')
| -rw-r--r-- | src/Blocks/BlockChest.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Blocks/BlockChest.h b/src/Blocks/BlockChest.h index 84dc324fb..b22c5f450 100644 --- a/src/Blocks/BlockChest.h +++ b/src/Blocks/BlockChest.h @@ -66,7 +66,7 @@ public: virtual void OnPlacedByPlayer( - cChunkInterface * a_ChunkInterface, cPlayer * a_Player, + cChunkInterface * a_ChunkInterface, cWorldInterface * a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta @@ -110,8 +110,13 @@ public: return "step.wood"; } + virtual bool CanBeAt(cChunkInterface * a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ, const cChunk & a_Chunk) override + { + return CanBeAt(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ); + } + - virtual bool CanBeAt(cChunkInterface * a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override + virtual bool CanBeAt(cChunkInterface * a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) { cBlockArea Area; if (!Area.Read(a_ChunkInterface, a_BlockX - 2, a_BlockX + 2, a_BlockY, a_BlockY, a_BlockZ - 2, a_BlockZ + 2)) @@ -206,7 +211,7 @@ public: /// If there's a chest in the a_Area in the specified coords, modifies its meta to a_NewMeta and returns true. - bool CheckAndAdjustNeighbor(cChunkInterface * a_ChunkInterface, const cBlockArea & a_Area, int a_RelX, int a_RelZ, NIBBLETYPE a_NewMeta) override + bool CheckAndAdjustNeighbor(cChunkInterface * a_ChunkInterface, const cBlockArea & a_Area, int a_RelX, int a_RelZ, NIBBLETYPE a_NewMeta) { if (a_Area.GetRelBlockType(a_RelX, 0, a_RelZ) != E_BLOCK_CHEST) { |