fix: drag mode release proper layer assignment

Author: AlexD717

fission/src/systems/scene/DragModeSystem.ts

@@ -358,8 +358,22 @@ class DragModeSystem extends WorldSystem {
     private stopDragging(): void {
         if (!this._isDragging) return
 
+        let targetSceneObject: MirabufSceneObject | undefined
+        let shouldTransition = true
+
+        if (this._dragTarget) {
+            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
+            targetSceneObject = association?.sceneObject
+            if (association?.isGamePiece) {
+                shouldTransition = false
+            }
+        }
+
         if (this._dragTarget?.physicsDisabled) {
-            World.physicsSystem.enablePhysicsForBody(this._dragTarget.bodyId)
+            World.physicsSystem.enablePhysicsForBody(
+                this._dragTarget.bodyId,
+                targetSceneObject?.mechanism.layerReserve?.layer
+            )
         } else if (this._dragTarget) {
             const body = World.physicsSystem.getBody(this._dragTarget.bodyId)
             if (body) {
@@ -387,17 +401,6 @@ class DragModeSystem extends WorldSystem {
             }
         }
 
-        let targetSceneObject: MirabufSceneObject | undefined
-        let shouldTransition = true
-
-        if (this._dragTarget) {
-            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
-            targetSceneObject = association?.sceneObject
-            if (association?.isGamePiece) {
-                shouldTransition = false
-            }
-        }
-
         this._isDragging = false
         this._dragTarget = undefined
 
@@ -428,6 +431,9 @@ class DragModeSystem extends WorldSystem {
             World.physicsSystem.activateBody(this._dragTarget.bodyId)
         }
 
+        const compensateGravity =
+            DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION && !this._dragTarget.physicsDisabled
+
         const currentPos = body.GetPosition()
         const currentPosition = new THREE.Vector3(currentPos.GetX(), currentPos.GetY(), currentPos.GetZ())
         const currentRotation = body.GetRotation()
@@ -509,7 +515,7 @@ class DragModeSystem extends WorldSystem {
             const forceNeeded = velocityError.multiplyScalar(forceMultiplier)
 
             // Add gravity compensation to counteract downward pull
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensation = new THREE.Vector3(
                     0,
                     mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE,
@@ -559,7 +565,7 @@ class DragModeSystem extends WorldSystem {
             )
 
             // Add gravity compensation to prevent falling when stationary
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensationY = mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE
                 brakingForce.SetY(brakingForce.GetY() + gravityCompensationY)
             }