Witch and cat are spawned at same position in swamp huts

The bug

Witch and cat in a swamp hut are spawned at the same position with same rotation.

Expected result

Witch and cat would be spawned at different positions within the swamp hut.

Code analysis

Code analysis can be found in this comment.