Fixed overlapping ships

Fixed taking items from the inventory
Cleanup of GamePlayer class