summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockCauldron.h2
-rw-r--r--src/Blocks/BlockMobSpawner.h4
-rw-r--r--src/Blocks/BlockOre.h2
3 files changed, 4 insertions, 4 deletions
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;
}