Re-implemented the pickup movement.
Moved getPosition from being a Player method to being an Entity method
Used this change to make the code look neater.