Unstable 0.1300.0.7

2021-04-07 15:24:22 +03:00
parent 96b2184811
commit 538c3dbfc3
47 changed files with 246 additions and 103 deletions
@@ -1127,6 +1127,7 @@ namespace Barotrauma
                if (statusEffect.type != actionType) { continue; }
                if (statusEffect.type == ActionType.OnDamaged)
                {
+                    if (character.LastDamage.Afflictions == null || character.LastDamage.Afflictions.None(a => a.Prefab.AfflictionType == "damage")) { continue; }
                    if (statusEffect.OnlyPlayerTriggered)
                    {
                        if (character.LastAttacker == null || !character.LastAttacker.IsPlayer)