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/BlockBigFlower.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 '')
-rw-r--r-- | src/Blocks/BlockBigFlower.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Blocks/BlockBigFlower.h b/src/Blocks/BlockBigFlower.h index 96139d656..38d867605 100644 --- a/src/Blocks/BlockBigFlower.h +++ b/src/Blocks/BlockBigFlower.h @@ -85,7 +85,7 @@ public: } } - virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override + virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override { NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); if (Meta & 0x8) @@ -94,10 +94,10 @@ public: } NIBBLETYPE FlowerMeta = Meta & 0x7; - if (!a_Player->IsGameModeCreative()) + if (!a_Player.IsGameModeCreative()) { if ( - (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && + (a_Player.GetEquippedItem().m_ItemType == E_ITEM_SHEARS) && ( (FlowerMeta == E_META_BIG_FLOWER_DOUBLE_TALL_GRASS) || (FlowerMeta == E_META_BIG_FLOWER_LARGE_FERN) @@ -117,12 +117,12 @@ public: } a_WorldInterface.SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ); } - a_Player->UseEquippedItem(); + a_Player.UseEquippedItem(); } } if ( - (a_Player->GetEquippedItem().m_ItemType != E_ITEM_SHEARS) && + (a_Player.GetEquippedItem().m_ItemType != E_ITEM_SHEARS) && ( (FlowerMeta == E_META_BIG_FLOWER_DOUBLE_TALL_GRASS) || (FlowerMeta == E_META_BIG_FLOWER_LARGE_FERN) |