@quenty/ragdoll 15.23.0 → 15.23.1-canary.545.2374fb2.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [15.23.1-canary.545.2374fb2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@15.23.0...@quenty/ragdoll@15.23.1-canary.545.2374fb2.0) (2025-04-05)
+
+
+### Bug Fixes
+
+* Add types to packages ([2374fb2](https://github.com/Quenty/NevermoreEngine/commit/2374fb2b043cfbe0e9b507b3316eec46a4e353a0))
+
+
+
+
+
 # [15.23.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@15.22.3...@quenty/ragdoll@15.23.0) (2025-04-02)
 
 **Note:** Version bump only for package @quenty/ragdoll

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/ragdoll",
-  "version": "15.23.0",
+  "version": "15.23.1-canary.545.2374fb2.0",
   "description": "Quenty's Ragdoll system for Roblox - Floppy fun ragdolls",
   "keywords": [
     "Roblox",
@@ -25,39 +25,39 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneedata": "^7.18.0",
-    "@quenty/attributeutils": "^14.17.0",
-    "@quenty/baseobject": "^10.8.0",
-    "@quenty/binder": "^14.19.0",
-    "@quenty/brio": "^14.17.0",
-    "@quenty/camera": "^14.20.0",
-    "@quenty/cancellabledelay": "^3.5.0",
-    "@quenty/characterutils": "^12.18.0",
-    "@quenty/draw": "^7.8.1",
-    "@quenty/enumutils": "^3.4.0",
-    "@quenty/hapticfeedbackutils": "^3.2.0",
-    "@quenty/instanceutils": "^13.17.0",
-    "@quenty/loader": "^10.8.0",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/motor6d": "^7.20.0",
-    "@quenty/physicsutils": "^8.17.0",
-    "@quenty/playerhumanoidbinder": "^14.19.0",
-    "@quenty/promise": "^10.10.1",
-    "@quenty/qframe": "^10.10.1",
-    "@quenty/r15utils": "^13.17.0",
-    "@quenty/remoting": "^12.18.0",
-    "@quenty/rx": "^13.17.0",
-    "@quenty/rxbinderutils": "^14.19.0",
-    "@quenty/rxsignal": "^7.17.0",
-    "@quenty/spring": "^10.8.1",
-    "@quenty/steputils": "^3.5.3",
-    "@quenty/table": "^3.7.1",
-    "@quenty/tie": "^10.20.0",
-    "@quenty/valuebaseutils": "^13.17.0",
-    "@quenty/valueobject": "^13.17.0"
+    "@quenty/adorneedata": "7.18.1-canary.545.2374fb2.0",
+    "@quenty/attributeutils": "14.17.1-canary.545.2374fb2.0",
+    "@quenty/baseobject": "10.8.1-canary.545.2374fb2.0",
+    "@quenty/binder": "14.19.1-canary.545.2374fb2.0",
+    "@quenty/brio": "14.17.1-canary.545.2374fb2.0",
+    "@quenty/camera": "14.20.1-canary.545.2374fb2.0",
+    "@quenty/cancellabledelay": "3.5.1-canary.545.2374fb2.0",
+    "@quenty/characterutils": "12.18.1-canary.545.2374fb2.0",
+    "@quenty/draw": "7.8.2-canary.545.2374fb2.0",
+    "@quenty/enumutils": "3.4.1-canary.545.2374fb2.0",
+    "@quenty/hapticfeedbackutils": "3.2.1-canary.545.2374fb2.0",
+    "@quenty/instanceutils": "13.17.1-canary.545.2374fb2.0",
+    "@quenty/loader": "10.8.1-canary.545.2374fb2.0",
+    "@quenty/maid": "3.4.1-canary.545.2374fb2.0",
+    "@quenty/motor6d": "7.20.1-canary.545.2374fb2.0",
+    "@quenty/physicsutils": "8.17.1-canary.545.2374fb2.0",
+    "@quenty/playerhumanoidbinder": "14.19.1-canary.545.2374fb2.0",
+    "@quenty/promise": "10.10.2-canary.545.2374fb2.0",
+    "@quenty/qframe": "10.10.2-canary.545.2374fb2.0",
+    "@quenty/r15utils": "13.17.1-canary.545.2374fb2.0",
+    "@quenty/remoting": "12.18.1-canary.545.2374fb2.0",
+    "@quenty/rx": "13.17.1-canary.545.2374fb2.0",
+    "@quenty/rxbinderutils": "14.19.1-canary.545.2374fb2.0",
+    "@quenty/rxsignal": "7.17.1-canary.545.2374fb2.0",
+    "@quenty/spring": "10.8.2-canary.545.2374fb2.0",
+    "@quenty/steputils": "3.5.4-canary.545.2374fb2.0",
+    "@quenty/table": "3.7.2-canary.545.2374fb2.0",
+    "@quenty/tie": "10.20.1-canary.545.2374fb2.0",
+    "@quenty/valuebaseutils": "13.17.1-canary.545.2374fb2.0",
+    "@quenty/valueobject": "13.17.1-canary.545.2374fb2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e8ea56930e65322fcffc05a1556d5df988068f0b"
+  "gitHead": "2374fb2b043cfbe0e9b507b3316eec46a4e353a0"
 }

package/src/Client/Classes/RagdollCameraShakeClient.lua

@@ -25,7 +25,7 @@ local RagdollCameraShakeClient = setmetatable({}, BaseObject)
 RagdollCameraShakeClient.ClassName = "RagdollCameraShakeClient"
 RagdollCameraShakeClient.__index = RagdollCameraShakeClient
 
-function RagdollCameraShakeClient.new(humanoid, serviceBag)
+function RagdollCameraShakeClient.new(humanoid: Humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollCameraShakeClient)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")

package/src/Client/Classes/RagdollHumanoidOnDeathClient.lua

@@ -76,7 +76,7 @@ end
 function RagdollHumanoidOnDeathClient.disableParticleEmittersAndFadeOutYielding(character, duration)
 	local descendants = character:GetDescendants()
 	local transparencies = {}
-	for _, instance in pairs(descendants) do
+	for _, instance in descendants do
 		if instance:IsA("BasePart") or instance:IsA("Decal") then
 			transparencies[instance] = instance.Transparency
 		elseif instance:IsA("ParticleEmitter") then
@@ -90,7 +90,7 @@ function RagdollHumanoidOnDeathClient.disableParticleEmittersAndFadeOutYielding(
 		local dt = RunService.Heartbeat:Wait()
 		t = t + dt
 		local alpha = math.min(t / duration, 1)
-		for part, initialTransparency in pairs(transparencies) do
+		for part, initialTransparency in transparencies do
 			part.Transparency = (1 - alpha) * initialTransparency + alpha
 		end
 	end

package/src/Client/RagdollBindersClient.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Holds binders for Ragdolls on the client. Be sure to initialize on the server. See [RagdollBindersClient] for details.
 	Be sure to use a [ServiceBag] to initialize this service.

package/src/Client/RagdollServiceClient.lua

@@ -10,6 +10,7 @@ local require = require(script.Parent.loader).load(script)
 local AttributeValue = require("AttributeValue")
 
 local Players = game:GetService("Players")
+local _ServiceBag = require("ServiceBag")
 
 local RagdollServiceClient = {}
 RagdollServiceClient.ServiceName = "RagdollServiceClient"
@@ -18,7 +19,7 @@ RagdollServiceClient.ServiceName = "RagdollServiceClient"
 	Initializes the ragdoll service on the client. Should be done via [ServiceBag].
 	@param serviceBag ServiceBag
 ]=]
-function RagdollServiceClient:Init(serviceBag)
+function RagdollServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -27,12 +28,12 @@ function RagdollServiceClient:Init(serviceBag)
 	self._serviceBag:GetService(require("CameraStackService"))
 
 	-- Internal
-	self._serviceBag:GetService(require("RagdollClient"))
-	self._serviceBag:GetService(require("RagdollableClient"))
-	self._serviceBag:GetService(require("RagdollHumanoidOnDeathClient"))
-	self._serviceBag:GetService(require("RagdollHumanoidOnFallClient"))
-	self._serviceBag:GetService(require("RagdollCameraShakeClient"))
-	self._serviceBag:GetService(require("RagdollBindersClient"))
+	self._serviceBag:GetService((require :: any)("RagdollClient"))
+	self._serviceBag:GetService((require :: any)("RagdollableClient"))
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnDeathClient"))
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnFallClient"))
+	self._serviceBag:GetService((require :: any)("RagdollCameraShakeClient"))
+	self._serviceBag:GetService((require :: any)("RagdollBindersClient"))
 
 	self._screenShakeEnabled = AttributeValue.new(Players.LocalPlayer, "RagdollScreenShakeEnabled", true)
 end
@@ -41,7 +42,7 @@ end
 	Sets screen shake enabled for the local player
 	@param value boolelan
 ]=]
-function RagdollServiceClient:SetScreenShakeEnabled(value)
+function RagdollServiceClient:SetScreenShakeEnabled(value: boolean)
 	assert(type(value) == "boolean", "Bad value")
 
 	self._screenShakeEnabled.Value = value

package/src/Server/Classes/RagdollCameraShake.lua

@@ -20,7 +20,7 @@ RagdollCameraShake.__index = RagdollCameraShake
 	@param serviceBag ServiceBag
 	@return RagdollCameraShake
 ]=]
-function RagdollCameraShake.new(humanoid, serviceBag)
+function RagdollCameraShake.new(humanoid: Humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollCameraShake)
 
 	self._serviceBag = assert(serviceBag, "Bad serviceBag")

package/src/Server/RagdollService.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Initializes ragdoll related binders
 
@@ -7,6 +8,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local _ServiceBag = require("ServiceBag")
+
 local RagdollService = {}
 RagdollService.ServiceName = "RagdollService"
 
@@ -14,7 +17,7 @@ RagdollService.ServiceName = "RagdollService"
 	Initializes the ragdoll service on the server. Should be done via [ServiceBag].
 	@param serviceBag ServiceBag
 ]=]
-function RagdollService:Init(serviceBag)
+function RagdollService:Init(serviceBag: _ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -25,17 +28,17 @@ function RagdollService:Init(serviceBag)
 	self._serviceBag:GetService(require("RagdollBindersServer"))
 
 	-- Binders
-	self._serviceBag:GetService(require("Ragdoll"))
-	self._serviceBag:GetService(require("Ragdollable"))
-	self._serviceBag:GetService(require("RagdollHumanoidOnDeath"))
-	self._serviceBag:GetService(require("RagdollHumanoidOnFall"))
-	self._serviceBag:GetService(require("UnragdollAutomatically"))
-	self._serviceBag:GetService(require("RagdollCameraShake"))
+	self._serviceBag:GetService((require :: any)("Ragdoll"))
+	self._serviceBag:GetService((require :: any)("Ragdollable"))
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnDeath"))
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnFall"))
+	self._serviceBag:GetService((require :: any)("UnragdollAutomatically"))
+	self._serviceBag:GetService((require :: any)("RagdollCameraShake"))
 
 	-- Configure
-	self._serviceBag:GetService(require("RagdollHumanoidOnDeath")):SetAutomaticTagging(false)
-	self._serviceBag:GetService(require("RagdollHumanoidOnFall")):SetAutomaticTagging(false)
-	self._serviceBag:GetService(require("UnragdollAutomatically")):SetAutomaticTagging(false)
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnDeath")):SetAutomaticTagging(false)
+	self._serviceBag:GetService((require :: any)("RagdollHumanoidOnFall")):SetAutomaticTagging(false)
+	self._serviceBag:GetService((require :: any)("UnragdollAutomatically")):SetAutomaticTagging(false)
 end
 
 --[=[

package/src/Shared/Classes/BindableRagdollHumanoidOnFall.lua

@@ -73,7 +73,7 @@ end
 function BindableRagdollHumanoidOnFall:_getLargestSpeedInRecords()
 	local largestSpeed = -math.huge
 
-	for _, velocityRecord in pairs(self._lastVelocityRecords) do
+	for _, velocityRecord in self._lastVelocityRecords do
 		local speed = velocityRecord.magnitude
 		if speed > largestSpeed then
 			largestSpeed = speed
@@ -87,9 +87,7 @@ function BindableRagdollHumanoidOnFall:_ragdollFromFall()
 	self.ShouldRagdoll.Value = true
 
 	task.spawn(function()
-		while self.Destroy
-			and self:_getLargestSpeedInRecords() >= 3
-			and self.ShouldRagdoll.Value do
+		while self.Destroy and self:_getLargestSpeedInRecords() >= 3 and self.ShouldRagdoll.Value do
 			task.wait(0.05)
 		end
 
@@ -117,7 +115,7 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 
 	local fellForAllFrames = true
 	local mostNegativeVelocityY = math.huge
-	for _, velocityRecord in pairs(self._lastVelocityRecords) do
+	for _, velocityRecord in self._lastVelocityRecords do
 		if velocityRecord.y >= -2 then
 			fellForAllFrames = false
 			break

package/src/Shared/Classes/RagdollableBase.lua

@@ -48,7 +48,7 @@ function RagdollableBase:ObserveIsRagdolled()
 	error("Not implemented")
 end
 
-function RagdollableBase:IsRagdolled()
+function RagdollableBase:IsRagdolled(): boolean
 	return self._obj:HasTag("Ragdoll")
 end
 

package/src/Shared/Rigging/RagdollAdditionalAttachmentUtils.lua

@@ -62,7 +62,7 @@ function RagdollAdditionalAttachmentUtils.ensureAdditionalAttachments(character,
 
 	local topMaid = Maid.new()
 
-	for _, data in pairs(RagdollAdditionalAttachmentUtils.getAdditionalAttachmentData(rigType)) do
+	for _, data in RagdollAdditionalAttachmentUtils.getAdditionalAttachmentData(rigType) do
 		local partName, attachmentName, cframe, baseAttachmentName = unpack(data)
 
 		if baseAttachmentName then

package/src/Shared/Rigging/RagdollBallSocketUtils.lua

@@ -196,7 +196,7 @@ function RagdollBallSocketUtils.ensureBallSockets(character, rigType)
 
 	local topMaid = Maid.new()
 
-	for _, data in pairs(RagdollBallSocketUtils.getRigData(rigType)) do
+	for _, data in RagdollBallSocketUtils.getRigData(rigType) do
 		local part0Name = assert(data.part0Name, "No part0Name")
 		local part1Name = assert(data.part1Name, "No part1Name")
 		local motorName = assert(data.motorName, "No motorName")
@@ -262,7 +262,7 @@ function RagdollBallSocketUtils.ensureBallSockets(character, rigType)
 				mass = RxPhysicsUtils.observePartMass(motorState.part1);
 			}):Subscribe(function(state)
 				local gravityScale = state.gravity / state.referenceGravity
-				local referenceMass = state.referenceMass;
+				local referenceMass = state.referenceMass
 				local massScale = referenceMass and (state.mass / referenceMass) or 1
 				ballSocket.MaxFrictionTorque = state.frictionTorque * massScale * gravityScale
 			end))

package/src/Shared/Rigging/RagdollCollisionUtils.lua

@@ -86,7 +86,7 @@ local R6_NO_COLLIDES = {
 	{"HumanoidRootPart", "Left Arm"},
 }
 
-function RagdollCollisionUtils.getCollisionData(rigType)
+function RagdollCollisionUtils.getCollisionData(rigType: Enum.HumanoidRigType)
 	if rigType == Enum.HumanoidRigType.R15 then
 		return R15_NO_COLLIDES
 	elseif rigType == Enum.HumanoidRigType.R6 then
@@ -96,10 +96,10 @@ function RagdollCollisionUtils.getCollisionData(rigType)
 	end
 end
 
-function RagdollCollisionUtils.preventCollisionAmongOthers(character, part)
+function RagdollCollisionUtils.preventCollisionAmongOthers(character: Model, part: BasePart)
 	local topMaid = Maid.new()
 
-	for _, partName in pairs(R15_PARTS) do
+	for _, partName in R15_PARTS do
 		topMaid:GiveTask(RxR15Utils.observeCharacterPartBrio(character, partName):Subscribe(function(brio)
 			if brio:IsDead() then
 				return
@@ -120,13 +120,13 @@ function RagdollCollisionUtils.preventCollisionAmongOthers(character, part)
 	return topMaid
 end
 
-function RagdollCollisionUtils.ensureNoCollides(character, rigType)
+function RagdollCollisionUtils.ensureNoCollides(character: Model, rigType: Enum.HumanoidRigType)
 	assert(typeof(character) == "Instance" and character:IsA("Model"), "Bad character")
 	assert(EnumUtils.isOfType(Enum.HumanoidRigType, rigType), "Bad rigType")
 
 	local topMaid = Maid.new()
 
-	for _, data in pairs(RagdollCollisionUtils.getCollisionData(rigType)) do
+	for _, data in RagdollCollisionUtils.getCollisionData(rigType) do
 		local part0Name, part1Name = unpack(data)
 
 		local observable = RxBrioUtils.flatCombineLatest({

package/src/Shared/Rigging/RagdollMotorUtils.lua

@@ -24,7 +24,15 @@ local Spring = require("Spring")
 
 local RagdollMotorUtils = {}
 
-local R6_MOTORS = {
+type MotorData = {
+	partName: string,
+	motorName: string,
+	isRootJoint: boolean?,
+}
+
+type MotorDataList = { MotorData }
+
+local R6_MOTORS: MotorDataList = {
 	{
 		partName = "Torso",
 		motorName = "Root",
@@ -52,7 +60,7 @@ local R6_MOTORS = {
 	},
 }
 
-local R15_MOTORS = {
+local R15_MOTORS: MotorDataList = {
 	{
 		partName = "LowerTorso",
 		motorName = "Root",
@@ -118,12 +126,12 @@ local R15_MOTORS = {
 
 local ROOT_JOINT_CACHE = {}
 
-function RagdollMotorUtils.getFirstRootJointData(rigType)
+function RagdollMotorUtils.getFirstRootJointData(rigType: Enum.HumanoidRigType): MotorData
 	if ROOT_JOINT_CACHE[rigType] then
 		return ROOT_JOINT_CACHE[rigType]
 	end
 
-	for _, item in pairs(RagdollMotorUtils.getMotorData(rigType)) do
+	for _, item in RagdollMotorUtils.getMotorData(rigType) do
 		if item.isRootJoint then
 			ROOT_JOINT_CACHE[rigType] = item
 			return item
@@ -133,7 +141,7 @@ function RagdollMotorUtils.getFirstRootJointData(rigType)
 	error("Could not find root joint data")
 end
 
-function RagdollMotorUtils.getMotorData(rigType)
+function RagdollMotorUtils.getMotorData(rigType: Enum.HumanoidRigType): MotorDataList
 	if rigType == Enum.HumanoidRigType.R15 then
 		return R15_MOTORS
 	elseif rigType == Enum.HumanoidRigType.R6 then
@@ -143,11 +151,11 @@ function RagdollMotorUtils.getMotorData(rigType)
 	end
 end
 
-function RagdollMotorUtils.initMotorAttributes(character, rigType)
+function RagdollMotorUtils.initMotorAttributes(character, rigType: Enum.HumanoidRigType)
 	assert(typeof(character) == "Instance" and character:IsA("Model"), "Bad character")
 	assert(EnumUtils.isOfType(Enum.HumanoidRigType, rigType), "Bad rigType")
 
-	for _, data in pairs(RagdollMotorUtils.getMotorData(rigType)) do
+	for _, data in RagdollMotorUtils.getMotorData(rigType) do
 		local motor = R15Utils.getRigMotor(character, data.partName, data.motorName)
 		if motor then
 			RagdollMotorData:InitAttributes(motor)
@@ -155,7 +163,7 @@ function RagdollMotorUtils.initMotorAttributes(character, rigType)
 	end
 end
 
-function RagdollMotorUtils.setupAnimatedMotor(character, part)
+function RagdollMotorUtils.setupAnimatedMotor(character: Model, part: BasePart)
 	local maid = Maid.new()
 
 	-- make this stuff not physics collide with our own rig
@@ -165,7 +173,7 @@ function RagdollMotorUtils.setupAnimatedMotor(character, part)
 	return maid
 end
 
-function RagdollMotorUtils.setupRagdollRootPartMotor(motor, part0, part1)
+function RagdollMotorUtils.setupRagdollRootPartMotor(motor: Motor6D, part0, part1)
 	local maid = Maid.new()
 
 	local ragdollMotorData = RagdollMotorData:Create(motor)
@@ -199,6 +207,13 @@ function RagdollMotorUtils.setupRagdollRootPartMotor(motor, part0, part1)
 			weld.C0 = innerState.C0 * innerState.Transform
 		end))
 
+		-- if weld:IsA("Motor6D") then
+		-- 	-- Suppress animations on any weld connection
+		-- 	weldMaid:GiveTask(RunService.Stepped:Connect(function()
+		-- 		weld.Transform = CFrame.new()
+		-- 	end))
+		-- end
+
 		weldMaid:GiveTask(RxInstanceUtils.observeProperty(motor, "C1"):Subscribe(function(c1)
 			weld.C1 = c1
 		end))
@@ -222,6 +237,15 @@ function RagdollMotorUtils.setupRagdollRootPartMotor(motor, part0, part1)
 		lastTransformSpring.s = speed
 	end))
 
+	-- Lerp smoothly to 0 to avoid jarring camera.
+	-- maid:GiveTask(RunService.Stepped:Connect(function()
+	-- 	local target = QFrame.toCFrame(lastTransformSpring.p)
+	-- 	if target then
+	-- 		transformValue.Value = target
+	-- 		motor.Transform = target
+	-- 	end
+	-- end))
+
 	motor.Enabled = false
 
 	maid:GiveTask(function()
@@ -231,7 +255,7 @@ function RagdollMotorUtils.setupRagdollRootPartMotor(motor, part0, part1)
 	return maid
 end
 
-function RagdollMotorUtils.setupRagdollMotor(motor, part0, part1)
+function RagdollMotorUtils.setupRagdollMotor(motor: Motor6D, part0: BasePart, part1: BasePart)
 	local maid = Maid.new()
 
 	motor.Enabled = false
@@ -239,7 +263,7 @@ function RagdollMotorUtils.setupRagdollMotor(motor, part0, part1)
 		local implemention = Motor6DStackInterface:FindFirstImplementation(motor)
 		if implemention then
 			local ragdollMotorData = RagdollMotorData:Create(motor)
-			local initialTransform = (part0.CFrame * motor.C0):toObjectSpace(part1.CFrame * motor.C1)
+			local initialTransform = (part0.CFrame * motor.C0):ToObjectSpace(part1.CFrame * motor.C1)
 			local speed = ragdollMotorData.RagdollSpringReturnSpeed.Value
 
 			implemention:TransformFromCFrame(initialTransform, speed)
@@ -255,7 +279,7 @@ function RagdollMotorUtils.setupRagdollMotor(motor, part0, part1)
 	return maid
 end
 
-function RagdollMotorUtils.suppressJustRootPart(character, rigType)
+function RagdollMotorUtils.suppressJustRootPart(character: Model, rigType: Enum.HumanoidRigType)
 	local data = RagdollMotorUtils.getFirstRootJointData(rigType)
 
 	local observable = RxR15Utils.observeRigMotorBrio(character, data.partName, data.motorName):Pipe({
@@ -295,13 +319,13 @@ function RagdollMotorUtils.suppressJustRootPart(character, rigType)
 	return topMaid
 end
 
-function RagdollMotorUtils.suppressMotors(character, rigType, velocityReadings)
+function RagdollMotorUtils.suppressMotors(character: Model, rigType: Enum.HumanoidRigType, velocityReadings)
 	assert(typeof(character) == "Instance" and character:IsA("Model"), "Bad character")
 	assert(EnumUtils.isOfType(Enum.HumanoidRigType, rigType), "Bad rigType")
 
 	local topMaid = Maid.new()
 
-	for _, data in pairs(RagdollMotorUtils.getMotorData(rigType)) do
+	for _, data in RagdollMotorUtils.getMotorData(rigType) do
 		local observable = RxR15Utils.observeRigMotorBrio(character, data.partName, data.motorName):Pipe({
 			RxBrioUtils.switchMapBrio(function(motor)
 				local ragdollMotorData = RagdollMotorData:Create(motor)
@@ -346,12 +370,12 @@ function RagdollMotorUtils.suppressMotors(character, rigType, velocityReadings)
 						if passed <= 0.1 then
 							local rotVelocity = velocityReadings.rotation[data]
 							if rotVelocity then
-								state.part1.RotVelocity += rotVelocity
+								state.part1.AssemblyAngularVelocity += rotVelocity
 							end
 
 							local velocity = velocityReadings.linear[data]
 							if velocity then
-								state.part1.Velocity += velocity
+								state.part1.AssemblyLinearVelocity += velocity
 							end
 						end
 					end)
@@ -363,7 +387,7 @@ function RagdollMotorUtils.suppressMotors(character, rigType, velocityReadings)
 	return topMaid
 end
 
-function RagdollMotorUtils.guessIfNetworkOwner(part)
+function RagdollMotorUtils.guessIfNetworkOwner(part: BasePart): boolean
 	local currentNetworkOwner
 	local expectedNetworkOwner = Players.LocalPlayer
 
@@ -382,19 +406,19 @@ function RagdollMotorUtils.guessIfNetworkOwner(part)
 	return CharacterUtils.getPlayerFromCharacter(part) == expectedNetworkOwner
 end
 
-function RagdollMotorUtils.promiseVelocityRecordings(character, rigType)
+function RagdollMotorUtils.promiseVelocityRecordings(character: Model, rigType: Enum.HumanoidRigType)
 	assert(typeof(character) == "Instance" and character:IsA("Model"), "Bad character")
 	assert(EnumUtils.isOfType(Enum.HumanoidRigType, rigType), "Bad rigType")
 
 	local parts = {}
 
 	local rootPart = character:FindFirstChild("HumanoidRootPart")
-	if not rootPart then
+	if rootPart == nil or not rootPart:IsA("BasePart") then
 		return Promise.rejected("No humanoid root part")
 	end
 
 	local initialRootPartCFrame = rootPart.CFrame
-	for _, data in pairs(RagdollMotorUtils.getMotorData(rigType)) do
+	for _, data in RagdollMotorUtils.getMotorData(rigType) do
 		local motor = R15Utils.getRigMotor(character, data.partName, data.motorName)
 		if motor then
 			local part0 = motor.Part0
@@ -404,7 +428,7 @@ function RagdollMotorUtils.promiseVelocityRecordings(character, rigType)
 					motor = motor,
 					part0 = part0,
 					part1 = part1,
-					relCFrame = initialRootPartCFrame:toObjectSpace(part1.CFrame),
+					relCFrame = initialRootPartCFrame:ToObjectSpace(part1.CFrame),
 				}
 			end
 		end
@@ -423,21 +447,21 @@ function RagdollMotorUtils.promiseVelocityRecordings(character, rigType)
 			rotation = {},
 		}
 
-		for data, info in pairs(parts) do
+		for data, info in parts do
 			local motor = R15Utils.getRigMotor(character, data.partName, data.motorName)
 
 			-- Validate all the same
-			if info.motor == motor and info.part0 == motor.Part0 and info.part1 == motor.Part1 then
-				local linear = newRootPartCFrame:pointToObjectSpace(info.part1.Position) - info.relCFrame.p
-				result.linear[data] = newRootPartCFrame:vectorToWorldSpace(linear / dt)
+			if motor ~= nil and info.motor == motor and info.part0 == motor.Part0 and info.part1 == motor.Part1 then
+				local linear = newRootPartCFrame:PointToObjectSpace(info.part1.Position) - info.relCFrame.Position
+				result.linear[data] = newRootPartCFrame:VectorToWorldSpace(linear / dt)
 
-				local change = info.relCFrame:toObjectSpace(newRootPartCFrame:toObjectSpace(info.part1.CFrame))
+				local change = info.relCFrame:ToObjectSpace(newRootPartCFrame:ToObjectSpace(info.part1.CFrame))
 
 				-- assume that we're XYZ ordered
 				local x, y, z = change:ToEulerAnglesXYZ()
 
-				local vector = newRootPartCFrame:vectorToWorldSpace(Vector3.new(x, y, z))
-				result.rotation[data] = vector / dt
+				local vector = newRootPartCFrame:VectorToWorldSpace(Vector3.new(x, y, z))
+				result.rotation[data] = vector/dt
 			end
 		end
 

package/src/Shared/Rigging/RxRagdollUtils.lua

@@ -181,7 +181,7 @@ function RxRagdollUtils.runLocal(humanoid: Humanoid)
 					:Then(function(velocityReadings)
 						debug.profilebegin("initragdoll")
 
-						maid:GiveTask(RxRagdollUtils.suppressRootPartCollision(character, rigType))
+					maid:GiveTask(RxRagdollUtils.suppressRootPartCollision(character))
 						maid:GiveTask(RxRagdollUtils.enforceHeadCollision(character))
 						maid:GiveTask(RxRagdollUtils.enforceHumanoidStateMachineOff(character, humanoid))