Fix NPCs (from Citizens) being viewed as proper players
Merge remote-tracking branch 'origin/master' & Fix NPC bugs with
Citizens plugin