Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.World/BaseAttributeMap.cpp b/Minecraft.World/BaseAttributeMap.cpp
index 8fb1b1f1..151448b5 100644
--- a/Minecraft.World/BaseAttributeMap.cpp
+++ b/Minecraft.World/BaseAttributeMap.cpp
@@ -24,7 +24,7 @@ AttributeInstance *BaseAttributeMap::getInstance(eATTRIBUTE_ID id)
 	}
 	else
 	{
-		return NULL;
+		return nullptr;
 	}
 }
 
@@ -50,7 +50,7 @@ void BaseAttributeMap::removeItemModifiers(shared_ptr<ItemInstance> item)
 			AttributeInstance* attribute = getInstance(it.first);
 			AttributeModifier* modifier = it.second;
 
-			if (attribute != NULL)
+			if (attribute != nullptr)
 			{
 				attribute->removeModifier(modifier);
 			}
@@ -72,7 +72,7 @@ void BaseAttributeMap::addItemModifiers(shared_ptr<ItemInstance> item)
 			AttributeInstance* attribute = getInstance(it.first);
 			AttributeModifier* modifier = it.second;
 
-			if (attribute != NULL)
+			if (attribute != nullptr)
 			{
 				attribute->removeModifier(modifier);
 				attribute->addModifier(new AttributeModifier(*modifier));