Removed IDamageable IsInvulnerable from time

vchelaru · Jan 27, 2024 · e76a00e · e76a00e
1 parent 4e86cff
commit e76a00e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Entities/IDamageable.cs b/Engines/FlatRedBallXNA/FlatRedBall/Entities/IDamageable.cs
@@ -14,7 +14,7 @@ public interface IDamageable
         double InvulnerabilityTimeAfterDamage { get; }
         double LastDamageTime { get; set; }
         decimal CurrentHealth { get; set; }
-        bool IsInvulnerable { get; }
+
         decimal MaxHealth { get; set; }
 
         /// <summary>
@@ -46,7 +46,7 @@ public static bool ShouldTakeDamage(this IDamageable damageable, IDamageArea dam
                 || damageable.CurrentHealth <= 0
                 || !damageArea.IsDamageDealingEnabled
                 || !damageable.IsDamageReceivingEnabled
-                || damageable.IsInvulnerable)
+                || TimeManager.CurrentScreenSecondsSince(damageable.LastDamageTime) < damageable.InvulnerabilityTimeAfterDamage)
             {
                 return false;
             }

diff --git a/FRBDK/Glue/OfficialPlugins/DamageDealingPlugin/CodeGenerators/DamageDealingCodeGenerator.cs b/FRBDK/Glue/OfficialPlugins/DamageDealingPlugin/CodeGenerators/DamageDealingCodeGenerator.cs
@@ -103,7 +103,6 @@ public override ICodeBlock GenerateFields(ICodeBlock codeBlock, IElement element
                     {
                         codeBlock.Line("public bool IsDamageReceivingEnabled { get; set; } = true;");
                         codeBlock.Line("public double InvulnerabilityTimeAfterDamage { get; set; } = 0;");
-                        codeBlock.Line("public bool IsInvulnerable => TimeManager.CurrentScreenSecondsSince(LastDamageTime) < InvulnerabilityTimeAfterDamage;");
                         codeBlock.Line("public double LastDamageTime { get; set; } = -999;");
                     }
                 }