From a9be52c41a02d207233199e98898fe7483d7e817 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sat, 7 Mar 2026 21:56:03 -0500
Subject: Project modernization (#630)

* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
---
 Minecraft.World/StructureFeature.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Minecraft.World/StructureFeature.cpp')

diff --git a/Minecraft.World/StructureFeature.cpp b/Minecraft.World/StructureFeature.cpp
index bbce7e1a..8de619ca 100644
--- a/Minecraft.World/StructureFeature.cpp
+++ b/Minecraft.World/StructureFeature.cpp
@@ -109,7 +109,7 @@ bool StructureFeature::isIntersection(int cellX, int cellZ)
 bool StructureFeature::isInsideFeature(int cellX, int cellY, int cellZ)
 {
 	restoreSavedData(level);
-	return getStructureAt(cellX, cellY, cellZ) != NULL;
+	return getStructureAt(cellX, cellY, cellZ) != nullptr;
 }
 
 StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ)
@@ -142,7 +142,7 @@ StructureStart *StructureFeature::getStructureAt(int cellX, int cellY, int cellZ
 			}
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 bool StructureFeature::isInsideBoundingFeature(int cellX, int cellY, int cellZ)
@@ -178,7 +178,7 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 	addFeature(level, cellX >> 4, cellZ >> 4, 0, 0, byteArray());
 
 	double minDistance = DBL_MAX;
-	TilePos *selected = NULL;
+	TilePos *selected = nullptr;
 
 	for(auto& it : cachedStructures)
 	{
@@ -203,14 +203,14 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 			}
 		}
 	}
-	if (selected != NULL)
+	if (selected != nullptr)
 	{
 		return selected;
 	}
 	else
 	{
 		vector<TilePos> *guesstimatedFeaturePositions = getGuesstimatedFeaturePositions();
-		if (guesstimatedFeaturePositions != NULL)
+		if (guesstimatedFeaturePositions != nullptr)
 		{
 			TilePos *pSelectedPos = new TilePos(0,0,0);
 
@@ -233,22 +233,22 @@ TilePos *StructureFeature::getNearestGeneratedFeature(Level *level, int cellX, i
 			return pSelectedPos;
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 vector<TilePos> *StructureFeature::getGuesstimatedFeaturePositions()
 {
-	return NULL;
+	return nullptr;
 }
 
 void StructureFeature::restoreSavedData(Level *level)
 {
 #ifdef ENABLE_STRUCTURE_SAVING
-	if (savedData == NULL)
+	if (savedData == nullptr)
 	{
 		savedData = dynamic_pointer_cast<StructureFeatureSavedData>( level->getSavedData(typeid(StructureFeatureSavedData), getFeatureName()) );
 
-		if (savedData == NULL)
+		if (savedData == nullptr)
 		{
 			savedData = shared_ptr<StructureFeatureSavedData>( new StructureFeatureSavedData(getFeatureName()) );
 			level->setSavedData(getFeatureName(), savedData);
-- 
cgit v1.2.3