The bug

When the world generates a witch hut, it at least sometimes (if not always) generates the witch in the same location as the black cat. They should not spawn within each others' hitboxes.

Steps to reproduce

1. Generate a world
2. Run /locate swamp_hut
3. Click on the command feedback to teleport yourself
4. Run the teleportation command
5. Enter witch hut

                   -->  See the witch and the black cat standing on the same block