From bbf5bec817c6c9824155c15d34806db152d5ed43 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Fri, 7 Jul 2017 15:37:53 +0100 Subject: BigFlower fixes (#3826) * BigFlowers fixes * Correct upper part meta * Documented parameters to DoesIgnoreBuildCollision --- src/Blocks/BlockHandler.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/Blocks/BlockHandler.h') diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h index 625def7d8..302fdbc4b 100644 --- a/src/Blocks/BlockHandler.h +++ b/src/Blocks/BlockHandler.h @@ -114,16 +114,11 @@ public: /** Checks if the player can build "inside" this block. For example blocks placed "on" snow will be placed at the same position. So: Snow ignores Build collision + @param a_Pos Position of the block + @param a_Player Player trying to build on the block + @param a_Meta Meta value of the block currently at a_Pos */ - virtual bool DoesIgnoreBuildCollision(void); - - /** Similar to DoesIgnoreBuildCollision(void), but is used for cases where block's meta or - player's item-in-hand is needed to determine collision (thin snow) */ - virtual bool DoesIgnoreBuildCollision(cPlayer *, NIBBLETYPE a_Meta) - { - UNUSED(a_Meta); - return DoesIgnoreBuildCollision(); - } + virtual bool DoesIgnoreBuildCollision(cChunkInterface & ChunkInterface, Vector3i a_Pos, cPlayer & a_Player, NIBBLETYPE a_Meta); /** Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true */ -- cgit v1.2.3