diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-07-31 22:17:52 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-08-01 08:21:20 +0200 |
| commit | 0d0323608df044aebfc6d0f3ac2ca5e07512facc (patch) | |
| tree | f2317e70c96b7ffc8f0dae99cd563163deb985ad /src/Blocks/BlockSlab.h | |
| parent | cWorld::SendBlockTo take player by ref (diff) | |
| download | cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar.gz cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar.bz2 cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar.lz cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar.xz cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.tar.zst cuberite-0d0323608df044aebfc6d0f3ac2ca5e07512facc.zip | |
Diffstat (limited to 'src/Blocks/BlockSlab.h')
| -rw-r--r-- | src/Blocks/BlockSlab.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h index a07c9e065..966aff4e2 100644 --- a/src/Blocks/BlockSlab.h +++ b/src/Blocks/BlockSlab.h @@ -31,14 +31,14 @@ public: } virtual bool GetPlacementBlockTypeMeta( - cChunkInterface & a_ChunkInterface, cPlayer * a_Player, + cChunkInterface & a_ChunkInterface, cPlayer & a_Player, 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 { a_BlockType = m_BlockType; - NIBBLETYPE Meta = static_cast<NIBBLETYPE>(a_Player->GetEquippedItem().m_ItemDamage); + NIBBLETYPE Meta = static_cast<NIBBLETYPE>(a_Player.GetEquippedItem().m_ItemDamage); // Set the correct metadata based on player equipped item (i.e. a_BlockMeta not initialised yet) switch (a_BlockFace) @@ -96,15 +96,15 @@ public: ); } - virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override + virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override { - if ((a_BlockFace == BLOCK_FACE_NONE) || (a_Player->GetEquippedItem().m_ItemType != static_cast<short>(m_BlockType))) + if ((a_BlockFace == BLOCK_FACE_NONE) || (a_Player.GetEquippedItem().m_ItemType != static_cast<short>(m_BlockType))) { return; } // Sends the slab back to the client. It's to refuse a doubleslab placement. */ - a_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, *a_Player); + a_Player.GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player); } /** Converts the single-slab blocktype to its equivalent double-slab blocktype */ |