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

@@ -540,7 +540,7 @@ newEntity{
 			who.turn_procs.shield_wrathful[target.uid] = true
 			
 
-			local tg = {type="hit", range=10}
+			local tg = {type="hit", range=10, friendlyfire=false}
 			local dam = special.shield_wrathful(who)
 			local damage = who:spellCrit(dam)