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/ModifiableAttributeInstance.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Minecraft.World/ModifiableAttributeInstance.cpp b/Minecraft.World/ModifiableAttributeInstance.cpp
index 3108df4d..216e5719 100644
--- a/Minecraft.World/ModifiableAttributeInstance.cpp
+++ b/Minecraft.World/ModifiableAttributeInstance.cpp
@@ -62,7 +62,7 @@ void ModifiableAttributeInstance::getModifiers(unordered_set<AttributeModifier *
 
 AttributeModifier *ModifiableAttributeInstance::getModifier(eMODIFIER_ID id)
 {
-	AttributeModifier *modifier = NULL;
+	AttributeModifier *modifier = nullptr;
 
     auto it = modifierById.find(id);
     if(it != modifierById.end())
@@ -85,7 +85,7 @@ void ModifiableAttributeInstance::addModifiers(unordered_set<AttributeModifier *
 void ModifiableAttributeInstance::addModifier(AttributeModifier *modifier)
 {
 	// Can't add modifiers with the same ID (unless the modifier is anonymous)
-	if (modifier->getId() != eModifierId_ANONYMOUS && getModifier(modifier->getId()) != NULL)
+	if (modifier->getId() != eModifierId_ANONYMOUS && getModifier(modifier->getId()) != nullptr)
 	{
 		assert(0);
 		// throw new IllegalArgumentException("Modifier is already applied on this attribute!");
@@ -126,7 +126,7 @@ void ModifiableAttributeInstance::removeModifier(AttributeModifier *modifier)
 void ModifiableAttributeInstance::removeModifier(eMODIFIER_ID id)
 {
 	AttributeModifier *modifier = getModifier(id);
-	if (modifier != NULL) removeModifier(modifier);
+	if (modifier != nullptr) removeModifier(modifier);
 }
 
 void ModifiableAttributeInstance::removeModifiers()
-- 
cgit v1.2.3