@@ -9,12 +9,12 @@ local AdorneeModelBoundingBox = require("AdorneeModelBoundingBox")
99local AdorneePartBoundingBox = require (" AdorneePartBoundingBox" )
1010local BaseObject = require (" BaseObject" )
1111local Maid = require (" Maid" )
12+ local Observable = require (" Observable" )
1213local Rx = require (" Rx" )
1314local RxBrioUtils = require (" RxBrioUtils" )
1415local RxInstanceUtils = require (" RxInstanceUtils" )
1516local RxPartBoundingBoxUtils = require (" RxPartBoundingBoxUtils" )
1617local ValueObject = require (" ValueObject" )
17- local _Observable = require (" Observable" )
1818
1919local AdorneeBoundingBox = setmetatable ({}, BaseObject )
2020AdorneeBoundingBox .ClassName = " AdorneeBoundingBox"
@@ -73,7 +73,7 @@ export type BoundingBoxData = {
7373 Observes the bounding box of the adornee
7474 @return Observable<BoundingBoxData>
7575]=]
76- function AdorneeBoundingBox .ObserveBoundingBox (self : AdorneeBoundingBox ): _Observable .Observable <BoundingBoxData>
76+ function AdorneeBoundingBox .ObserveBoundingBox (self : AdorneeBoundingBox ): Observable .Observable <BoundingBoxData>
7777 return Rx .combineLatest ({
7878 CFrame = self :ObserveCFrame (),
7979 Size = self :ObserveSize (),
106106 Observes the cframe of the adornee
107107 @return Observable<Vector3>
108108]=]
109- function AdorneeBoundingBox .ObserveCFrame (self : AdorneeBoundingBox ): _Observable .Observable < CFrame ?>
109+ function AdorneeBoundingBox .ObserveCFrame (self : AdorneeBoundingBox ): Observable .Observable < CFrame ?>
110110 return self ._bbCFrame :Observe ()
111111end
112112
122122 Observes the size of the adornee
123123 @return Observable<Vector3>
124124]=]
125- function AdorneeBoundingBox .ObserveSize (self : AdorneeBoundingBox ): _Observable .Observable < Vector3 ?>
125+ function AdorneeBoundingBox .ObserveSize (self : AdorneeBoundingBox ): Observable .Observable < Vector3 ?>
126126 return self ._bbSize :Observe ()
127127end
128128
@@ -198,13 +198,14 @@ function AdorneeBoundingBox._setupHumanoid(self: AdorneeBoundingBox, humanoid: H
198198 local topMaid = Maid .new ()
199199
200200 topMaid :GiveTask (RxInstanceUtils .observePropertyBrio (humanoid , " Parent" , function (parent : Instance )
201- return parent :IsA (" Model" )
201+ return parent and parent :IsA (" Model" )
202202 end ):Subscribe (function (brio )
203203 if brio :IsDead () then
204204 return
205205 end
206206
207207 local maid , model = brio :ToMaidAndValue ()
208+ assert (typeof (model ) == " Instance" and model :IsA (" Model" ), " Bad model" )
208209
209210 maid :GiveTask (self :_setupModel (model ))
210211 end ))
@@ -236,8 +237,8 @@ function AdorneeBoundingBox._setupAttachment(self: AdorneeBoundingBox, attachmen
236237 else
237238 return Rx .of (nil )
238239 end
239- end ),
240- RxBrioUtils .flattenToValueAndNil ,
240+ end ) :: any ,
241+ RxBrioUtils .flattenToValueAndNil :: any ,
241242 })
242243 :Subscribe (function (cframe )
243244 self ._bbCFrame .Value = cframe
0 commit comments