1 files changed, 21 insertions, 15 deletions

diff --git a/src/Items/ItemNetherWart.h b/src/Items/ItemNetherWart.h
index 3586231b3..462ea61f9 100644
--- a/src/Items/ItemNetherWart.h
+++ b/src/Items/ItemNetherWart.h
@@ -8,47 +8,53 @@
 
 
 
-class cItemNetherWartHandler :
+class cItemNetherWartHandler:
 	public cItemHandler
 {
+	using Super = cItemHandler;
+
 public:
-	cItemNetherWartHandler(int a_ItemType) :
-		cItemHandler(a_ItemType)
-	{
 
+	cItemNetherWartHandler(int a_ItemType):
+		Super(a_ItemType)
+	{
 	}
 
+
+
+
+
 	virtual bool IsPlaceable(void) override
 	{
 		return true;
 	}
 
+
+
+
+
 	virtual bool GetPlacementBlockTypeMeta(
 		cWorld * a_World, cPlayer * a_Player,
-		int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
-		int a_CursorX, int a_CursorY, int a_CursorZ,
+		const Vector3i a_PlacedBlockPos,
+		eBlockFace a_ClickedBlockFace,
+		const Vector3i a_CursorPos,
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
 	) override
 	{
-		if (a_BlockFace != BLOCK_FACE_TOP)
+		// Only allow planting nether wart onto the top side of the block:
+		if (a_ClickedBlockFace != BLOCK_FACE_TOP)
 		{
-			// Only allow planting nether wart from the top side of the block
 			return false;
 		}
 
-		// Only allow placement on farmland
-		int X = a_BlockX;
-		int Y = a_BlockY;
-		int Z = a_BlockZ;
-		AddFaceDirection(X, Y, Z, a_BlockFace, true);
-		if (a_World->GetBlock(X, Y, Z) != E_BLOCK_SOULSAND)
+		// Only allow placement on soulsand
+		if ((a_PlacedBlockPos.y < 1) || (a_World->GetBlock(a_PlacedBlockPos.addedY(-1)) != E_BLOCK_SOULSAND))
 		{
 			return false;
 		}
 
 		a_BlockMeta = 0;
 		a_BlockType = E_BLOCK_NETHER_WART;
-
 		return true;
 	}
 } ;