Fix player and passenger Teleportation by reverting a few changes.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>