Prevent dropping Nessah's heart before handing it in

source/scripts/_00e_fs_nqr03_heartsc.psc

@@ -2,31 +2,30 @@ Scriptname _00E_FS_NQR03_HeartSC extends ObjectReference
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
-	If FS_NQR03.GetCurrentStageID() >= 90 && FS_NQR03.GetCurrentStageID() <= 95
+	If FS_NQR03.GetCurrentStageID() >= 90 && FS_NQR03.GetCurrentStageID() <= 100
-		If akNewContainer == PlayerREF && !bDone
+		If akNewContainer == PlayerREF
-			bDone = True	
+			if ! FS_NQR03.IsObjectiveDisplayed(40)
 				FS_NQR03.SetObjectiveDisplayed(40, True, True)
+			endif
 		ElseIf akOldContainer == PlayerREF
-			Ingredient rNessahsHeart = GetBaseObject() as Ingredient
-			
 			if akNewContainer
-				akNewContainer.RemoveItem(rNessahsHeart, 1, true)
+				akNewContainer.RemoveItem(_00E_FS_NQR03_NessahsHeart, 1, true)
 			else
 				Disable()
 				Delete()
 			endif
 			
-			PlayerREF.AddItem(rNessahsHeart, 1, true)
+			PlayerREF.AddItem(_00E_FS_NQR03_NessahsHeart, 1, true)
 			_00E_FS_CantDropItemMessage.Show()
 		EndIf
 	EndIf
   
 EndEvent
 
-bool bDone
-
 Actor Property PlayerREF Auto
 
 _00E_FS_NQR03_Functions Property FS_NQR03 Auto
 
 Message Property _00E_FS_CantDropItemMessage Auto
+
+Ingredient Property _00E_FS_NQR03_NessahsHeart Auto