From d97f780a8b6050353631fffc854b6ece1b98f6ad Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Tue, 28 Apr 2020 15:32:10 +0200 Subject: [PATCH] Fix some damage being counted wrongly which causes desyncs --- src/crits.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crits.cpp b/src/crits.cpp index 0b6aeb1b..78f2affd 100644 --- a/src/crits.cpp +++ b/src/crits.cpp @@ -815,7 +815,7 @@ public: // General damage counter int damage = event->GetInt("damageamount"); - if (damage > player_status_list[victim].health) + if (damage > player_status_list[victim].health && !event->GetInt("health")) damage = player_status_list[victim].health; // Not a melee weapon