refine death stuff
Qi Daozei entity merge patch
search for traps