Closes #12697 Closes #16300
Fixes issue where NPC does not attack, even when aggro'd. Fixes #16210 Closes #16204