From 28614b922fb77149a54da1a87bebfbc98736f296 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:08:36 -0400
Subject: Modernize project codebase (#906)

* 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

* Add safety checks and fix a issue with vector going OOR
---
 Minecraft.World/Sapling.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/Minecraft.World/Sapling.cpp b/Minecraft.World/Sapling.cpp
index 85fcea98..c169a608 100644
--- a/Minecraft.World/Sapling.cpp
+++ b/Minecraft.World/Sapling.cpp
@@ -17,7 +17,7 @@ const wstring Sapling::TEXTURE_NAMES[] = {L"sapling", L"sapling_spruce", L"sapli
 Sapling::Sapling(int id) : Bush( id )
 {
 	this->updateDefaultShape();
-	icons = NULL;
+	icons = nullptr;
 }
 
 // 4J Added override
@@ -65,7 +65,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
 {
 	int data = level->getData(x, y, z) & TYPE_MASK;
 
-	Feature *f = NULL;
+	Feature *f = nullptr;
 
 	int ox = 0, oz = 0;
 	bool multiblock = false;
@@ -93,12 +93,12 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
 					break;
 				}
 			}
-			if (f != NULL)
+			if (f != nullptr)
 			{
 				break;
 			}
 		}
-		if (f == NULL)
+		if (f == nullptr)
 		{
 			ox = oz = 0;
 			f = new TreeFeature(true, 4 + random->nextInt(7), TreeTile::JUNGLE_TRUNK, LeafTile::JUNGLE_LEAF, false);
@@ -138,7 +138,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random)
 			level->setTileAndData(x, y, z, id, data, Tile::UPDATE_NONE);
 		}
 	}
-	if( f != NULL )
+	if( f != nullptr )
 		delete f;
 }
 
-- 
cgit v1.2.3