Fixed a merge conflict in player.java

player was missing a function added by christian that wasn't integrated
with hamdan's changes to the player.java file