Think I may have a solution but i'm not sure if this will work (nor have I tested it.)
move from the bottom of NPC::Death
to below
Code:
//do faction hits even if we are a merchant, so long as a player killed us
if(give_exp_client)
hate_list.DoFactionHits(GetNPCFactionID());