Commit 18e2cde9383eaf426b304c72e15a58c076247fe2

Authored by DarkGod
2 parents fe1d20fc 0dc63520

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{
540 540 who.turn_procs.shield_wrathful[target.uid] = true
541 541
542 542
543   - local tg = {type="hit", range=10}
  543 + local tg = {type="hit", range=10, friendlyfire=false}
544 544 local dam = special.shield_wrathful(who)
545 545 local damage = who:spellCrit(dam)
546 546
... ...