Merge branch 'smartcmd:main' into main

1 files changed, 19 insertions, 19 deletions

diff --git a/Minecraft.World/HellFlatLevelSource.cpp b/Minecraft.World/HellFlatLevelSource.cpp
index 4957f617..c4ba062c 100644
--- a/Minecraft.World/HellFlatLevelSource.cpp
+++ b/Minecraft.World/HellFlatLevelSource.cpp
@@ -4,11 +4,11 @@
 #include "net.minecraft.world.level.storage.h"
 #include "HellFlatLevelSource.h"
 
-HellFlatLevelSource::HellFlatLevelSource(Level *level, __int64 seed)
+HellFlatLevelSource::HellFlatLevelSource(Level *level, int64_t seed)
 {
 	int xzSize = level->getLevelData()->getXZSize();
 	int hellScale = level->getLevelData()->getHellScale();
-	m_XZSize = ceil((float)xzSize / hellScale);
+	m_XZSize = ceil(static_cast<float>(xzSize) / hellScale);
 
 	this->level = level;
 
@@ -26,19 +26,19 @@ void HellFlatLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks)
 {
 	int height = blocks.length / (16 * 16);
 
-	for (int xc = 0; xc < 16; xc++) 
+	for (int xc = 0; xc < 16; xc++)
 	{
-		for (int zc = 0; zc < 16; zc++) 
+		for (int zc = 0; zc < 16; zc++)
 		{
-			for (int yc = 0; yc < height; yc++) 
+			for (int yc = 0; yc < height; yc++)
 			{
 				int block = 0;
 				if ( (yc <= 6) || ( yc >= 121 ) )
 				{
 					block = Tile::netherRack_Id;
-				} 
+				}
 
-				blocks[xc << 11 | zc << 7 | yc] = (byte) block;
+				blocks[xc << 11 | zc << 7 | yc] = static_cast<byte>(block);
 			}
 		}
 	}
@@ -60,7 +60,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
 				{
 					if( z - random->nextInt( 4 ) <= 0 || xOffs < -(m_XZSize/2) )
 					{
-						blocks[offs] = (byte) Tile::unbreakable_Id;
+						blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 						blockSet = true;
 					}
 				}
@@ -68,7 +68,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
 				{
 					if( x - random->nextInt( 4 ) <= 0 || zOffs < -(m_XZSize/2))
 					{
-						blocks[offs] = (byte) Tile::unbreakable_Id;
+						blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 						blockSet = true;
 					}
 				}
@@ -76,7 +76,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
 				{
 					if( z + random->nextInt(4) >= 15 || xOffs > (m_XZSize/2))
 					{
-						blocks[offs] = (byte) Tile::unbreakable_Id;
+						blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 						blockSet = true;
 					}
 				}
@@ -84,7 +84,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
 				{
 					if( x + random->nextInt(4) >= 15 || zOffs > (m_XZSize/2) )
 					{
-						blocks[offs] = (byte) Tile::unbreakable_Id;
+						blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 						blockSet = true;
 					}
 				}
@@ -93,11 +93,11 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks)
 
 				if (y >= Level::genDepthMinusOne - random->nextInt(5))
 				{
-					blocks[offs] = (byte) Tile::unbreakable_Id;
+					blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 				}
 				else if (y <= 0 + random->nextInt(5))
 				{
-					blocks[offs] = (byte) Tile::unbreakable_Id;
+					blocks[offs] = static_cast<byte>(Tile::unbreakable_Id);
 				}
 			}
 		}
@@ -115,7 +115,7 @@ LevelChunk *HellFlatLevelSource::getChunk(int xOffs, int zOffs)
 
 	// 4J - now allocating this with a physical alloc & bypassing general memory management so that it will get cleanly freed
 	int chunksSize = Level::genDepth * 16  * 16;
-	byte *tileData = (byte *)XPhysicalAlloc(chunksSize, MAXULONG_PTR, 4096, PAGE_READWRITE);
+	byte *tileData = static_cast<byte *>(XPhysicalAlloc(chunksSize, MAXULONG_PTR, 4096, PAGE_READWRITE));
 	XMemSet128(tileData,0,chunksSize);
 	byteArray blocks = byteArray(tileData,chunksSize);
 	//    byteArray blocks = byteArray(16 * level->depth * 16);
@@ -159,8 +159,8 @@ void HellFlatLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
 	// we need to use a separate random - have used the same initialisation code as used in RandomLevelSource::postProcess to make sure this random value
 	// is consistent for each world generation. Also changed all uses of random here to pprandom.
 	pprandom->setSeed(level->getSeed());
-	__int64 xScale = pprandom->nextLong() / 2 * 2 + 1;
-	__int64 zScale = pprandom->nextLong() / 2 * 2 + 1;
+	int64_t xScale = pprandom->nextLong() / 2 * 2 + 1;
+	int64_t zScale = pprandom->nextLong() / 2 * 2 + 1;
 	pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed());
 
 	int count = pprandom->nextInt(pprandom->nextInt(10) + 1) + 1;
@@ -211,16 +211,16 @@ wstring HellFlatLevelSource::gatherStats()
 vector<Biome::MobSpawnerData *> *HellFlatLevelSource::getMobsAt(MobCategory *mobCategory, int x, int y, int z)
 {
 	Biome *biome = level->getBiome(x, z);
-	if (biome == NULL) 
+	if (biome == nullptr)
 	{
-		return NULL;
+		return nullptr;
 	}
 	return biome->getMobs(mobCategory);
 }
 
 TilePos *HellFlatLevelSource::findNearestMapFeature(Level *level, const wstring& featureName, int x, int y, int z)
 {
-	return NULL;
+	return nullptr;
 }
 
 void HellFlatLevelSource::recreateLogicStructuresForChunk(int chunkX, int chunkZ)