Merge branch 'smartcmd:main' into main

1 files changed, 4 insertions, 4 deletions

diff --git a/Minecraft.World/RandomScatteredLargeFeature.cpp b/Minecraft.World/RandomScatteredLargeFeature.cpp
index bd0b70bb..3b03dba6 100644
--- a/Minecraft.World/RandomScatteredLargeFeature.cpp
+++ b/Minecraft.World/RandomScatteredLargeFeature.cpp
@@ -67,7 +67,7 @@ bool RandomScatteredLargeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat
 
 	bool forcePlacement = false;
 	LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
-	if( levelGenOptions != NULL )
+	if( levelGenOptions != nullptr )
 	{
 		forcePlacement = levelGenOptions->isFeatureChunk(x,z,eFeature_Temples);
 	}
@@ -123,14 +123,14 @@ RandomScatteredLargeFeature::ScatteredFeatureStart::ScatteredFeatureStart(Level
 bool RandomScatteredLargeFeature::isSwamphut(int cellX, int cellY, int cellZ)
 {
 	StructureStart *structureAt = getStructureAt(cellX, cellY, cellZ);
-	if (structureAt == NULL || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
+	if (structureAt == nullptr || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
 	{
 		return false;
 	}
-	StructurePiece *first = NULL;
+	StructurePiece *first = nullptr;
     auto it = structureAt->pieces.begin();
     if(it != structureAt->pieces.end() ) first = *it;
-	return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != NULL;
+	return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != nullptr;
 }
 
 vector<Biome::MobSpawnerData *> *RandomScatteredLargeFeature::getSwamphutEnemies()