Exiting boat with a villager punches the villager

Exiting a boat using the "leave boat" button while having a villager in the back causes you to punch. This punch hits the villager, as the villager is moved to the center of the boat where the player exits from. This issue causes iron golems to attack and villager prices to be raised.