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/Blocks/BlockCauldron.h   | 2 +-
 src/Blocks/BlockMobSpawner.h | 4 ++--
 src/Blocks/BlockOre.h        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h
index 80f95164f..cbd17a849 100644
--- a/src/Blocks/BlockCauldron.h
+++ b/src/Blocks/BlockCauldron.h
@@ -146,7 +146,7 @@ private:
 			}
 		}
 
-		if (!ItemHandler(EquippedItem.m_ItemType)->IsPlaceable())
+		if (!EquippedItem.GetHandler().IsPlaceable())
 		{
 			// Item not placeable in the first place, our work is done:
 			return true;
diff --git a/src/Blocks/BlockMobSpawner.h b/src/Blocks/BlockMobSpawner.h
index da5bd84c4..b4981abe9 100644
--- a/src/Blocks/BlockMobSpawner.h
+++ b/src/Blocks/BlockMobSpawner.h
@@ -71,8 +71,8 @@ private:
 		}
 
 		const auto Player = static_cast<const cPlayer *>(a_Digger);
-		auto Handler = Player->GetEquippedItem().GetHandler();
-		if (!Player->IsGameModeSurvival() || !Handler->CanHarvestBlock(E_BLOCK_MOB_SPAWNER))
+		auto & Handler = Player->GetEquippedItem().GetHandler();
+		if (!Player->IsGameModeSurvival() || !Handler.CanHarvestBlock(E_BLOCK_MOB_SPAWNER))
 		{
 			return;
 		}
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index 3bd193ee3..c2526e16c 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -94,7 +94,7 @@ private:
 			return;
 		}
 
-		if (!ItemHandler(Player->GetEquippedItem().m_ItemType)->CanHarvestBlock(m_BlockType))
+		if (!Player->GetEquippedItem().GetHandler().CanHarvestBlock(m_BlockType))
 		{
 			return;
 		}
-- 
cgit v1.2.3