Fixed entity damage in protected areas
Merge ecomponents with esuite