Added damage triggers to fix combat damage