Merge branch 'wrathful-ego-fix' into 'master'

Makes warthful ego on-block damage friendly-fire safe as the description implies…

… and to avoid hitting ourself if we block damage from a floor effect.

See merge request !715