[Bug] Transport pathing on land to continue on water

[Bianary]

My transport is pathing across land, making what should be completed in one move take two turns (Because it ends movement when it goes onto land and ends again when it re-enters the water). This happens on longer trips too, this was just a good example. The unit does attempt to take the path drawn here.

To add a second bug, upon going onto land from a transport the unit has its destination cleared (It works the other way, a vehicle going into a transport preserves its final destination)