@quenty/ragdoll 15.24.0-canary.ae8d76d.0 → 15.24.1-canary.d9ea7a3.0

package/CHANGELOG.md

@@ -3,7 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.24.0-canary.ae8d76d.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@15.23.3...@quenty/ragdoll@15.24.0-canary.ae8d76d.0) (2025-05-10)
+## [15.24.1-canary.d9ea7a3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@15.24.0...@quenty/ragdoll@15.24.1-canary.d9ea7a3.0) (2025-05-12)
+
+**Note:** Version bump only for package @quenty/ragdoll
+
+
+
+
+
+# [15.24.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@15.23.3...@quenty/ragdoll@15.24.0) (2025-05-10)
 
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/ragdoll",
-  "version": "15.24.0-canary.ae8d76d.0",
+  "version": "15.24.1-canary.d9ea7a3.0",
   "description": "Quenty's Ragdoll system for Roblox - Floppy fun ragdolls",
   "keywords": [
     "Roblox",
@@ -25,39 +25,39 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneedata": "7.19.0-canary.ae8d76d.0",
-    "@quenty/attributeutils": "14.18.0-canary.ae8d76d.0",
-    "@quenty/baseobject": "10.8.3",
-    "@quenty/binder": "14.20.0-canary.ae8d76d.0",
-    "@quenty/brio": "14.18.0-canary.ae8d76d.0",
-    "@quenty/camera": "14.21.0-canary.ae8d76d.0",
-    "@quenty/cancellabledelay": "3.5.2",
-    "@quenty/characterutils": "12.19.0-canary.ae8d76d.0",
-    "@quenty/draw": "7.8.4",
+    "@quenty/adorneedata": "7.19.0",
+    "@quenty/attributeutils": "14.18.0",
+    "@quenty/baseobject": "10.9.0",
+    "@quenty/binder": "14.20.1-canary.d9ea7a3.0",
+    "@quenty/brio": "14.18.0",
+    "@quenty/camera": "14.21.1-canary.d9ea7a3.0",
+    "@quenty/cancellabledelay": "3.6.0",
+    "@quenty/characterutils": "12.19.0",
+    "@quenty/draw": "7.9.0",
     "@quenty/enumutils": "3.4.2",
-    "@quenty/hapticfeedbackutils": "3.2.2",
-    "@quenty/instanceutils": "13.18.0-canary.ae8d76d.0",
-    "@quenty/loader": "10.8.3",
-    "@quenty/maid": "3.4.3",
-    "@quenty/motor6d": "7.21.0-canary.ae8d76d.0",
-    "@quenty/physicsutils": "8.18.0-canary.ae8d76d.0",
-    "@quenty/playerhumanoidbinder": "14.20.0-canary.ae8d76d.0",
-    "@quenty/promise": "10.11.0-canary.ae8d76d.0",
-    "@quenty/qframe": "10.11.0-canary.ae8d76d.0",
-    "@quenty/r15utils": "13.18.0-canary.ae8d76d.0",
-    "@quenty/remoting": "12.19.0-canary.ae8d76d.0",
-    "@quenty/rx": "13.18.0-canary.ae8d76d.0",
-    "@quenty/rxbinderutils": "14.20.0-canary.ae8d76d.0",
-    "@quenty/rxsignal": "7.18.0-canary.ae8d76d.0",
-    "@quenty/spring": "10.9.0-canary.ae8d76d.0",
-    "@quenty/steputils": "3.5.5",
-    "@quenty/table": "3.7.4",
-    "@quenty/tie": "10.21.0-canary.ae8d76d.0",
-    "@quenty/valuebaseutils": "13.18.0-canary.ae8d76d.0",
-    "@quenty/valueobject": "13.18.0-canary.ae8d76d.0"
+    "@quenty/hapticfeedbackutils": "3.3.0",
+    "@quenty/instanceutils": "13.18.0",
+    "@quenty/loader": "10.9.0",
+    "@quenty/maid": "3.5.0",
+    "@quenty/motor6d": "7.21.1-canary.d9ea7a3.0",
+    "@quenty/physicsutils": "8.18.0",
+    "@quenty/playerhumanoidbinder": "14.20.1-canary.d9ea7a3.0",
+    "@quenty/promise": "10.11.0",
+    "@quenty/qframe": "10.11.0",
+    "@quenty/r15utils": "13.18.0",
+    "@quenty/remoting": "12.19.0",
+    "@quenty/rx": "13.18.0",
+    "@quenty/rxbinderutils": "14.20.1-canary.d9ea7a3.0",
+    "@quenty/rxsignal": "7.18.0",
+    "@quenty/spring": "10.9.0",
+    "@quenty/steputils": "3.6.0",
+    "@quenty/table": "3.8.0",
+    "@quenty/tie": "10.21.0",
+    "@quenty/valuebaseutils": "13.18.0",
+    "@quenty/valueobject": "13.18.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ae8d76d996594e017ac4bfa19f3c064ebe307cd8"
+  "gitHead": "d9ea7a314a7d50712e6abac75d29901c1edea556"
 }

package/src/Client/Classes/RagdollCameraShakeClient.lua

@@ -4,22 +4,22 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local Workspace = game:GetService("Workspace")
-local UserInputService = game:GetService("UserInputService")
 local RunService = game:GetService("RunService")
+local UserInputService = game:GetService("UserInputService")
+local Workspace = game:GetService("Workspace")
 
 local BaseObject = require("BaseObject")
 local Binder = require("Binder")
 local CameraStackService = require("CameraStackService")
 local HapticFeedbackUtils = require("HapticFeedbackUtils")
 local Maid = require("Maid")
+local RagdollClient = require("RagdollClient")
 local RagdollMotorUtils = require("RagdollMotorUtils")
 local RagdollServiceClient = require("RagdollServiceClient")
 local RxBrioUtils = require("RxBrioUtils")
 local RxCharacterUtils = require("RxCharacterUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local RxR15Utils = require("RxR15Utils")
-local RagdollClient = require("RagdollClient")
 
 local RagdollCameraShakeClient = setmetatable({}, BaseObject)
 RagdollCameraShakeClient.ClassName = "RagdollCameraShakeClient"
@@ -34,25 +34,27 @@ function RagdollCameraShakeClient.new(humanoid: Humanoid, serviceBag)
 	self._ragdollBinder = self._serviceBag:GetService(RagdollClient)
 
 	-- While we've got a charater and we're ragdolled
-	self._maid:GiveTask(RxCharacterUtils.observeIsOfLocalCharacterBrio(self._obj):Pipe({
-		RxBrioUtils.switchMapBrio(function()
-			return self._ragdollBinder:ObserveBrio(self._obj)
-		end);
-	}):Subscribe(function(brio)
-		if brio:IsDead() then
-			return
-		end
+	self._maid:GiveTask(RxCharacterUtils.observeIsOfLocalCharacterBrio(self._obj)
+		:Pipe({
+			RxBrioUtils.switchMapBrio(function()
+				return self._ragdollBinder:ObserveBrio(self._obj)
+			end),
+		})
+		:Subscribe(function(brio)
+			if brio:IsDead() then
+				return
+			end
 
-		local maid = brio:ToMaid()
+			local maid = brio:ToMaid()
 
-		maid:GiveTask(task.spawn(function()
-			-- Yield in the same way just to ensure no weird shakes.
-			RagdollMotorUtils.yieldUntilStepped()
+			maid:GiveTask(task.spawn(function()
+				-- Yield in the same way just to ensure no weird shakes.
+				RagdollMotorUtils.yieldUntilStepped()
 
-			maid:GiveTask(self:_setupHapticFeedback())
-			maid:GiveTask(self:_setupCameraShake(self._cameraStackService:GetImpulseCamera()))
+				maid:GiveTask(self:_setupHapticFeedback())
+				maid:GiveTask(self:_setupCameraShake(self._cameraStackService:GetImpulseCamera()))
+			end))
 		end))
-	end))
 
 	return self
 end
@@ -67,57 +69,63 @@ function RagdollCameraShakeClient:_setupCameraShake(impulseCamera)
 
 	topMaid:GiveTask(RxInstanceUtils.observePropertyBrio(self._obj, "Parent", function(character)
 		return character ~= nil
-	end):Pipe({
-		RxBrioUtils.switchMapBrio(function(character)
-			return RxBrioUtils.flatCombineLatestBrio({
-				upperTorso = RxR15Utils.observeCharacterPartBrio(character, "UpperTorso");
-				head = RxR15Utils.observeCharacterPartBrio(character, "Head")
-			}, function(state)
-				return state.upperTorso and state.head
-			end)
-		end);
-	}):Subscribe(function(brio)
-		if brio:IsDead() then
-			return
-		end
-
-		local maid = brio:ToMaid()
-		local state = brio:GetValue()
-
-		local function getEstimatedVelocityFromUpperTorso()
-			-- TODO: Consider neck attachments
-			local headOffset = state.upperTorso.Size*Vector3.new(0, 0.5, 0)
-				+ state.head.Size*Vector3.new(0, 0.5, 0)
-			local headPosition = state.upperTorso.CFrame:PointToWorldSpace(headOffset)
-
-			return state.upperTorso:GetVelocityAtPosition(headPosition)
-		end
-
-		local lastVelocity = getEstimatedVelocityFromUpperTorso()
-		maid:GiveTask(RunService.Heartbeat:Connect(function()
-			debug.profilebegin("ragdollcamerashake")
+	end)
+		:Pipe({
+			RxBrioUtils.switchMapBrio(function(character)
+				return RxBrioUtils.flatCombineLatestBrio({
+					upperTorso = RxR15Utils.observeCharacterPartBrio(character, "UpperTorso"),
+					head = RxR15Utils.observeCharacterPartBrio(character, "Head"),
+				}, function(state)
+					return state.upperTorso and state.head
+				end)
+			end),
+		})
+		:Subscribe(function(brio)
+			if brio:IsDead() then
+				return
+			end
 
-			local cameraCFrame = Workspace.CurrentCamera.CFrame
+			local maid = brio:ToMaid()
+			local state = brio:GetValue()
 
-			local velocity = getEstimatedVelocityFromUpperTorso()
-			local dVelocity = velocity - lastVelocity
-			if dVelocity.magnitude >= 0 then
-				if self._ragdollServiceClient:GetScreenShakeEnabled() then
-					-- Defaults, but we should tune these
-					local speed = 20
-					local damper = 0.5
+			local function getEstimatedVelocityFromUpperTorso()
+				-- TODO: Consider neck attachments
+				local headOffset = state.upperTorso.Size * Vector3.new(0, 0.5, 0)
+					+ state.head.Size * Vector3.new(0, 0.5, 0)
+				local headPosition = state.upperTorso.CFrame:PointToWorldSpace(headOffset)
 
-					speed = 40
-					damper = 0.3
+				return state.upperTorso:GetVelocityAtPosition(headPosition)
+			end
 
-					impulseCamera:Impulse(cameraCFrame:vectorToObjectSpace(-0.1*cameraCFrame.lookVector:Cross(dVelocity)), speed, damper)
+			local lastVelocity = getEstimatedVelocityFromUpperTorso()
+			maid:GiveTask(RunService.Heartbeat:Connect(function()
+				debug.profilebegin("ragdollcamerashake")
+
+				local cameraCFrame = Workspace.CurrentCamera.CFrame
+
+				local velocity = getEstimatedVelocityFromUpperTorso()
+				local dVelocity = velocity - lastVelocity
+				if dVelocity.magnitude >= 0 then
+					if self._ragdollServiceClient:GetScreenShakeEnabled() then
+						-- Defaults, but we should tune these
+						local speed = 20
+						local damper = 0.5
+
+						speed = 40
+						damper = 0.3
+
+						impulseCamera:Impulse(
+							cameraCFrame:vectorToObjectSpace(-0.1 * cameraCFrame.lookVector:Cross(dVelocity)),
+							speed,
+							damper
+						)
+					end
 				end
-			end
 
-			lastVelocity = velocity
-			debug.profileend()
+				lastVelocity = velocity
+				debug.profileend()
+			end))
 		end))
-	end))
 
 	return topMaid
 end
@@ -131,7 +139,7 @@ function RagdollCameraShakeClient:_setupHapticFeedback()
 	end
 
 	maid:GiveTask(task.spawn(function()
-		for i=1, 0, -0.1 do
+		for i = 1, 0, -0.1 do
 			HapticFeedbackUtils.setSmallVibration(lastInputType, i)
 			task.wait(0.05)
 		end
@@ -146,4 +154,4 @@ function RagdollCameraShakeClient:_setupHapticFeedback()
 	return maid
 end
 
-return Binder.new("RagdollCameraShake", RagdollCameraShakeClient)
+return Binder.new("RagdollCameraShake", RagdollCameraShakeClient)

package/src/Client/Classes/RagdollClient.lua

@@ -16,7 +16,6 @@
 
 local require = require(script.Parent.loader).load(script)
 
-
 local BaseObject = require("BaseObject")
 local Binder = require("Binder")
 
@@ -38,4 +37,4 @@ function RagdollClient.new(humanoid, serviceBag)
 	return self
 end
 
-return Binder.new("Ragdoll", RagdollClient)
+return Binder.new("Ragdoll", RagdollClient)

package/src/Client/Classes/RagdollHumanoidOnDeathClient.lua

@@ -7,8 +7,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local RunService = game:GetService("RunService")
 local Players = game:GetService("Players")
+local RunService = game:GetService("RunService")
 local Workspace = game:GetService("Workspace")
 
 local BaseObject = require("BaseObject")
@@ -96,4 +96,4 @@ function RagdollHumanoidOnDeathClient.disableParticleEmittersAndFadeOutYielding(
 	end
 end
 
-return Binder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeathClient)
+return Binder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeathClient)

package/src/Client/Classes/RagdollHumanoidOnFallClient.lua

@@ -55,4 +55,4 @@ function RagdollHumanoidOnFallClient:_update()
 	end
 end
 
-return Binder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFallClient)
+return Binder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFallClient)

package/src/Client/Classes/RagdollableClient.lua

@@ -7,12 +7,12 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local RagdollableBase = require("RagdollableBase")
-local RagdollClient = require("RagdollClient")
-local RxRagdollUtils = require("RxRagdollUtils")
 local Binder = require("Binder")
+local RagdollClient = require("RagdollClient")
+local RagdollableBase = require("RagdollableBase")
 local RagdollableInterface = require("RagdollableInterface")
 local Rx = require("Rx")
+local RxRagdollUtils = require("RxRagdollUtils")
 
 local RagdollableClient = setmetatable({}, RagdollableBase)
 RagdollableClient.ClassName = "RagdollableClient"
@@ -43,7 +43,7 @@ function RagdollableClient:ObserveIsRagdolled()
 	return self._ragdollBinder:Observe(self._obj):Pipe({
 		Rx.map(function(value)
 			return value and true or false
-		end)
+		end),
 	})
 end
 
@@ -55,4 +55,4 @@ function RagdollableClient:_onRagdollChanged(ragdoll)
 	end
 end
 
-return Binder.new("Ragdollable", RagdollableClient)
+return Binder.new("Ragdollable", RagdollableClient)

package/src/Client/RagdollBindersClient.lua

@@ -17,7 +17,7 @@ local require = require(script.Parent.loader).load(script)
 local BinderProvider = require("BinderProvider")
 
 return BinderProvider.new(script.Name, function(self, serviceBag)
---[=[
+	--[=[
 	Apply this binder to a humanoid to ragdoll it. Humanoid must already have [Ragdollable] defined.
 
 	```lua
@@ -33,24 +33,24 @@ return BinderProvider.new(script.Name, function(self, serviceBag)
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollClient")))
 
---[=[
+	--[=[
 	Enables ragdolling on a humanoid.
 	@prop Ragdollable Binder<RagdollableClient>
 	@within RagdollBindersClient
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollableClient")))
 
---[=[
+	--[=[
 	Automatically applies ragdoll upon humanoid death.
 	@prop RagdollaRagdollHumanoidOnDeathble Binder<RagdollHumanoidOnDeathClient>
 	@within RagdollBindersClient
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollHumanoidOnDeathClient")))
 
---[=[
+	--[=[
 	Automatically applies ragdoll upon humanoid fall.
 	@prop RagdollHumanoidOnFall Binder<RagdollHumanoidOnFallClient>
 	@within RagdollBindersClient
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollHumanoidOnFallClient")))
-end)
+end)

package/src/Client/RagdollServiceClient.lua

@@ -58,4 +58,4 @@ function RagdollServiceClient:GetScreenShakeEnabled()
 	return self._screenShakeEnabled.Value
 end
 
-return RagdollServiceClient
+return RagdollServiceClient

package/src/Server/Classes/Ragdoll.lua

@@ -49,4 +49,4 @@ function Ragdoll.new(humanoid: Humanoid, _serviceBag: ServiceBag.ServiceBag)
 	return self
 end
 
-return Binder.new("Ragdoll", Ragdoll)
+return Binder.new("Ragdoll", Ragdoll)

package/src/Server/Classes/RagdollCameraShake.lua

@@ -7,8 +7,8 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local Ragdoll = require("Ragdoll")
 local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
+local Ragdoll = require("Ragdoll")
 
 local RagdollCameraShake = setmetatable({}, BaseObject)
 RagdollCameraShake.ClassName = "RagdollCameraShake"
@@ -26,8 +26,7 @@ function RagdollCameraShake.new(humanoid: Humanoid, serviceBag)
 	self._serviceBag = assert(serviceBag, "Bad serviceBag")
 	self._ragdollBinder = self._serviceBag:GetService(Ragdoll)
 
-
 	return self
 end
 
-return PlayerHumanoidBinder.new("RagdollCameraShake", RagdollCameraShake)
+return PlayerHumanoidBinder.new("RagdollCameraShake", RagdollCameraShake)

package/src/Server/Classes/RagdollHumanoidOnDeath.lua

@@ -7,8 +7,8 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local Ragdoll = require("Ragdoll")
 local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
+local Ragdoll = require("Ragdoll")
 
 local RagdollHumanoidOnDeath = setmetatable({}, BaseObject)
 RagdollHumanoidOnDeath.ClassName = "RagdollHumanoidOnDeath"
@@ -40,4 +40,4 @@ function RagdollHumanoidOnDeath.new(humanoid, serviceBag)
 	return self
 end
 
-return PlayerHumanoidBinder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeath)
+return PlayerHumanoidBinder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeath)

package/src/Server/Classes/RagdollHumanoidOnFall.lua

@@ -45,7 +45,6 @@ function RagdollHumanoidOnFall.new(humanoid, serviceBag)
 			self:_handleServerEvent(...)
 		end))
 	else
-
 		self._maid:GiveTask(self:_getOrCreateRagdollLogic().ShouldRagdoll.Changed:Connect(function()
 			self:_update()
 		end))
@@ -90,4 +89,4 @@ function RagdollHumanoidOnFall:_update()
 	end
 end
 
-return PlayerHumanoidBinder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFall)
+return PlayerHumanoidBinder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFall)

package/src/Server/Classes/Ragdollable.lua

@@ -6,7 +6,6 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local RagdollableBase = require("RagdollableBase")
 local Maid = require("Maid")
 local Motor6DStackHumanoid = require("Motor6DStackHumanoid")
 local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
@@ -15,10 +14,11 @@ local RagdollAdditionalAttachmentUtils = require("RagdollAdditionalAttachmentUti
 local RagdollBallSocketUtils = require("RagdollBallSocketUtils")
 local RagdollCollisionUtils = require("RagdollCollisionUtils")
 local RagdollMotorUtils = require("RagdollMotorUtils")
-local RxBrioUtils = require("RxBrioUtils")
-local RxRagdollUtils = require("RxRagdollUtils")
+local RagdollableBase = require("RagdollableBase")
 local RagdollableInterface = require("RagdollableInterface")
 local Rx = require("Rx")
+local RxBrioUtils = require("RxBrioUtils")
+local RxRagdollUtils = require("RxRagdollUtils")
 
 local Ragdollable = setmetatable({}, RagdollableBase)
 Ragdollable.ClassName = "Ragdollable"
@@ -41,8 +41,8 @@ function Ragdollable.new(humanoid, serviceBag)
 	-- Ensure predefined physics rig immediatelly on the server.
 	-- We do this so during replication loop-back there's no chance of death.
 	self._maid:GiveTask(RxBrioUtils.flatCombineLatest({
-		character = RxRagdollUtils.observeCharacterBrio(self._obj);
-		rigType = RxRagdollUtils.observeRigType(self._obj);
+		character = RxRagdollUtils.observeCharacterBrio(self._obj),
+		rigType = RxRagdollUtils.observeRigType(self._obj),
 	}):Subscribe(function(state)
 		if state.character and state.rigType then
 			local maid = Maid.new()
@@ -74,7 +74,7 @@ function Ragdollable:ObserveIsRagdolled()
 	return self._ragdollBinder:Observe(self._obj):Pipe({
 		Rx.map(function(value)
 			return value and true or false
-		end)
+		end),
 	})
 end
 
@@ -98,4 +98,4 @@ function Ragdollable:_setRagdollEnabled(isEnabled)
 	end
 end
 
-return PlayerHumanoidBinder.new("Ragdollable", Ragdollable)
+return PlayerHumanoidBinder.new("Ragdollable", Ragdollable)

package/src/Server/Classes/UnragdollAutomatically.lua

@@ -8,7 +8,6 @@ local require = require(script.Parent.loader).load(script)
 
 local AttributeValue = require("AttributeValue")
 local BaseObject = require("BaseObject")
-local cancellableDelay = require("cancellableDelay")
 local CharacterUtils = require("CharacterUtils")
 local Maid = require("Maid")
 local Observable = require("Observable")
@@ -20,6 +19,7 @@ local RxBinderUtils = require("RxBinderUtils")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local UnragdollAutomaticallyConstants = require("UnragdollAutomaticallyConstants")
+local cancellableDelay = require("cancellableDelay")
 
 local UnragdollAutomatically = setmetatable({}, BaseObject)
 UnragdollAutomatically.ClassName = "UnragdollAutomatically"
@@ -39,8 +39,10 @@ function UnragdollAutomatically.new(humanoid, serviceBag)
 	self._ragdollHumanoidOnFallBinder = self._serviceBag:GetService(RagdollHumanoidOnFall)
 	self._player = CharacterUtils.getPlayerFromCharacter(self._obj)
 
-	self._unragdollAutomatically = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE, true)
-	self._unragdollAutomaticTime = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE, 5)
+	self._unragdollAutomatically =
+		AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE, true)
+	self._unragdollAutomaticTime =
+		AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE, 5)
 
 	self._maid:GiveTask(self._ragdollBinder:ObserveInstance(self._obj, function()
 		self:_handleRagdollChanged(self._maid)
@@ -52,20 +54,22 @@ end
 
 function UnragdollAutomatically:_handleRagdollChanged(maid)
 	if self._ragdollBinder:Get(self._obj) then
-		maid._unragdoll = self:_observeCanUnragdollTimer():Pipe({
-			Rx.switchMap(function(state)
-				if state then
-					return self:_observeAlive()
-				else
-					return Rx.of(false);
+		maid._unragdoll = self:_observeCanUnragdollTimer()
+			:Pipe({
+				Rx.switchMap(function(state)
+					if state then
+						return self:_observeAlive()
+					else
+						return Rx.of(false)
+					end
+				end),
+				Rx.distinct(),
+			})
+			:Subscribe(function(canUnragdoll)
+				if canUnragdoll then
+					self._ragdollBinder:Unbind(self._obj)
 				end
-			end);
-			Rx.distinct();
-		}):Subscribe(function(canUnragdoll)
-			if canUnragdoll then
-				self._ragdollBinder:Unbind(self._obj)
-			end
-		end)
+			end)
 	else
 		maid._unragdoll = nil
 	end
@@ -75,8 +79,8 @@ function UnragdollAutomatically:_observeAlive()
 	return RxInstanceUtils.observeProperty(self._obj, "Health"):Pipe({
 		Rx.map(function(health)
 			return health > 0
-		end);
-		Rx.distinct();
+		end),
+		Rx.distinct(),
 	})
 end
 
@@ -91,21 +95,21 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 
 		maid:GiveTask(RxBrioUtils.flatCombineLatest({
 			canUnragdoll = RxBrioUtils.flatCombineLatest({
-				enabled = self._unragdollAutomatically:Observe();
-				isFallingRagdoll = self:_observeIsFallingRagdoll();
+				enabled = self._unragdollAutomatically:Observe(),
+				isFallingRagdoll = self:_observeIsFallingRagdoll(),
 			}):Pipe({
 				Rx.map(function(state)
 					return state.enabled and not state.isFallingRagdoll
-				end);
-				Rx.distinct();
+				end),
+				Rx.distinct(),
 				Rx.tap(function(canUnragdoll)
 					-- Ensure we reset timer if we change state
 					if canUnragdoll then
 						startTime = os.clock()
 					end
-				end);
-			});
-			time = self._unragdollAutomaticTime:Observe();
+				end),
+			}),
+			time = self._unragdollAutomaticTime:Observe(),
 		}):Subscribe(function(state)
 			if state.canUnragdoll then
 				maid._deferred = nil
@@ -121,7 +125,6 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 					end)
 				end
 			else
-
 				isReady.Value = false
 				maid._deferred = nil
 			end
@@ -137,14 +140,13 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 end
 
 function UnragdollAutomatically:_observeIsFallingRagdoll()
-	return RxBinderUtils.observeBoundClassBrio(self._ragdollHumanoidOnFallBinder, self._obj)
-		:Pipe({
-			RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
-				return ragdollHumanoidOnFall:ObserveIsFalling()
-			end);
-			RxBrioUtils.emitOnDeath(false);
-			Rx.distinct();
-		})
+	return RxBinderUtils.observeBoundClassBrio(self._ragdollHumanoidOnFallBinder, self._obj):Pipe({
+		RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
+			return ragdollHumanoidOnFall:ObserveIsFalling()
+		end),
+		RxBrioUtils.emitOnDeath(false),
+		Rx.distinct(),
+	})
 end
 
-return PlayerHumanoidBinder.new("UnragdollAutomatically", UnragdollAutomatically)
+return PlayerHumanoidBinder.new("UnragdollAutomatically", UnragdollAutomatically)

package/src/Server/Classes/UnragdollAutomaticallyConstants.lua

@@ -7,6 +7,6 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE = "UnragdollAutomatically";
-	UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE = "UnragdollAutomaticTime";
-})
+	UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE = "UnragdollAutomatically",
+	UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE = "UnragdollAutomaticTime",
+})