Revert %player change

The %player should use their real name, with %displayname dealing with the nicks. 

The "fix" that was submitted and accepted completely overrode the %player and rendered %displayname redundant. This reverts that.