From 3ff57559e36d3254c64e334fbe3bdd47398fe16f Mon Sep 17 00:00:00 2001
From: x12xx12x <44411062+12xx12@users.noreply.github.com>
Date: Thu, 2 Dec 2021 00:31:10 +0100
Subject: ItemHandler initialisation is a constant expression (#5344)

* Transition to non-pointer item handler
* That is my destructor - I decide when I leave this world
* I declare your destruction private and you final
---
 src/Items/ItemBottle.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/Items/ItemBottle.h')

diff --git a/src/Items/ItemBottle.h b/src/Items/ItemBottle.h
index 84950de29..a324eb101 100644
--- a/src/Items/ItemBottle.h
+++ b/src/Items/ItemBottle.h
@@ -9,17 +9,14 @@
 
 
 
-class cItemBottleHandler:
+class cItemBottleHandler final:
 	public cItemHandler
 {
 	using Super = cItemHandler;
 
 public:
 
-	cItemBottleHandler():
-		Super(E_ITEM_GLASS_BOTTLE)
-	{
-	}
+	using Super::Super;
 
 
 
@@ -28,7 +25,7 @@ public:
 	/** Searches for a water source block in the line of sight.
 	Returns true and sets a_BlockPos if a water source block is found within line-of-sight.
 	Returns false if not. */
-	bool GetBlockFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & a_BlockPos)
+	bool GetBlockFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & a_BlockPos) const
 	{
 		class cCallbacks:
 			public cBlockTracer::cCallbacks
@@ -81,7 +78,7 @@ public:
 		const cItem & a_HeldItem,
 		const Vector3i a_ClickedBlockPos,
 		eBlockFace a_ClickedBlockFace
-	) override
+	) const override
 	{
 		if (a_ClickedBlockFace != BLOCK_FACE_NONE)
 		{
-- 
cgit v1.2.3