3 files changed, 6 insertions, 6 deletions

diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 5da6b4833..fcad9032c 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -513,7 +513,7 @@ void cCaveTunnel::ProcessChunk(
 				{
 					if (cChunkDef::GetBlock(a_BlockTypes, x, y, z) == E_BLOCK_SAND)
 					{
-						int Index = cChunkDef::MakeIndexNoCheck(x, y, z);
+						const auto Index = cChunkDef::MakeIndex(x, y, z);
 						if (a_BlockMetas[Index] == 1)
 						{
 							a_BlockMetas[Index] = 0;
diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp
index b4b8e8868..b2a332489 100644
--- a/src/Generating/ChunkDesc.cpp
+++ b/src/Generating/ChunkDesc.cpp
@@ -572,8 +572,8 @@ void cChunkDesc::RandomFillRelCuboid(
 
 cBlockEntity * cChunkDesc::GetBlockEntity(int a_RelX, int a_RelY, int a_RelZ)
 {
-	auto Idx = static_cast<size_t>(cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ));
-	auto itr = m_BlockEntities.find(Idx);
+	const auto Idx = cChunkDef::MakeIndex(a_RelX, a_RelY, a_RelZ);
+	const auto itr = m_BlockEntities.find(Idx);
 
 	if (itr != m_BlockEntities.end())
 	{
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index ef4af91c5..a6da93976 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -1227,7 +1227,7 @@ void cFinishGenBottomLava::GenFinish(cChunkDesc & a_ChunkDesc)
 	{
 		for (int z = 0; z < cChunkDef::Width; z++) for (int x = 0; x < cChunkDef::Width; x++)
 		{
-			int Index = cChunkDef::MakeIndexNoCheck(x, y, z);
+			const auto Index = cChunkDef::MakeIndex(x, y, z);
 			if (BlockTypes[Index] == E_BLOCK_AIR)
 			{
 				BlockTypes[Index] = E_BLOCK_STATIONARY_LAVA;
@@ -2000,8 +2000,8 @@ void cFinishGenOreNests::GenerateOre(
 							continue;
 						}
 
-						int Index = cChunkDef::MakeIndexNoCheck(BlockX, BlockY, BlockZ);
-						auto blockType = blockTypes[Index];
+						const auto Index = cChunkDef::MakeIndex(BlockX, BlockY, BlockZ);
+						const auto blockType = blockTypes[Index];
 						if ((blockType == E_BLOCK_STONE) || (blockType == E_BLOCK_NETHERRACK))
 						{
 							blockTypes[Index] = a_OreType;