Closes #12697 Closes #16300 (cherry picked from commit ccf3ed40e2ed5c320fe2f468f5ba0f2bff5e27fa)
Fixes issue where NPC does not attack, even when aggro'd. Fixes #16210 Closes #16204 (cherry picked from commit ad425f9f17502772289dd18ef6b74dc465556221)