Parrot dying while using Riptide enchantment

While using a riptide enchanted trident in the rain, with a parrot perched on your shoulder, the parrot will die shortly after you launch, saying it was slain by the player. I did a little testing and this seems to happen because the parrot dismounts from the player, but starts flying in front of them, causing the player to hit the parrot with the riptide impact. Some possible solutions would be changing parrot AI to stay on the shoulder while holding a trident, giving the parrot temporary invulnerability after dismounting, or making tamed parrots immune to damage from Riptide