Moved collision detection to Player class