Add auf's changes to player: and npc: args
Merge pull request #362 from aufdemrand/mcmonkey-working

Fix player: and npc: issues