Revert "Revert "fixed players losing location on timeout kick""

This reverts commit b94e7101d81493d85de2b4a0f435be3d1bdfca07.