removed npc resurrection in events temporarily
Merge branch 'master' into beta