Fix npc loading based on status
Merge pull request #1031 from igorko/master

Fix npc loading based on status