bug: fix issue where it would send more than available HP for a playe… (

#67)
5stackgg · Jan 13, 2025 · 6fc47bc · 6fc47bc
1 parent 8876e6f
commit 6fc47bc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 92 deletions.
diff --git a/cfg/base.cfg b/cfg/base.cfg
diff --git a/cfg/knife.cfg b/cfg/knife.cfg
diff --git a/cfg/live.cfg b/cfg/live.cfg
diff --git a/cfg/warmup.cfg b/cfg/warmup.cfg
diff --git a/src/FiveStack.Events/Bomb.cs b/src/FiveStack.Events/Bomb.cs
@@ -41,7 +41,7 @@ public HookResult BombPlaned(EventBombPlanted @event, GameEventInfo info)
     }
 
     [GameEventHandler]
-    public HookResult BombPlaned(EventBombDefused @event, GameEventInfo info)
+    public HookResult BombDefused(EventBombDefused @event, GameEventInfo info)
     {
         MatchManager? match = _matchService.GetCurrentMatch();
         MatchData? matchData = match?.GetMatchData();

diff --git a/src/FiveStack.Events/PlayerDamage.cs b/src/FiveStack.Events/PlayerDamage.cs
@@ -38,6 +38,16 @@ public HookResult OnPlayerDamage(EventPlayerHurt @event, GameEventInfo info)
         var attackerLocation = attacker?.PlayerPawn.Value?.AbsOrigin;
         var attackedLocation = attacked?.PlayerPawn?.Value?.AbsOrigin;
 
+        var damageDealt = @event.DmgHealth;
+
+        if (attacked != null)
+        {
+            if (attacked.PlayerPawn.Value.Health < 0)
+            {
+                damageDealt = damageDealt + attacked.PlayerPawn.Value.Health;
+            }
+        }
+
         _matchEvents.PublishGameEvent(
             "damage",
             new Dictionary<string, object>
@@ -58,7 +68,7 @@ public HookResult OnPlayerDamage(EventPlayerHurt @event, GameEventInfo info)
                         : ""
                 },
                 { "weapon", $"{(@event.Weapon.Length == 0 ? "worldent" : @event.Weapon)}" },
-                { "damage", @event.DmgHealth },
+                { "damage", damageDealt },
                 { "damage_armor", @event.DmgArmor },
                 { "hitgroup", $"{DamageUtility.HitGroupToString(@event.Hitgroup)}" },
                 { "health", @event.Health },