There are also some changes to fix problems when trapping is enabled while damage is disabled or the other way round.