From 62efe2893683543d9b2f723635da80cac810a52d Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 19 Jan 2022 12:58:06 -0600
Subject: [PATCH] Fixes for damage system

---
 scripts/server/client.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/server/client.js b/scripts/server/client.js
index 98b6b1f3..d0a0b2fb 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -25,6 +25,7 @@ function addAllNetworkHandlers() {
     addNetworkEventHandler("vrr.promptAnswerNo", playerPromptAnswerNo);
     addNetworkEventHandler("vrr.promptAnswerYes", playerPromptAnswerYes);
     addNetworkEventHandler("vrr.toggleGUI", playerToggledGUI);
+    addNetworkEventHandler("vrr.2fa", checkPlayerTwoFactorAuthentication);
 
     // AFK
     addNetworkEventHandler("vrr.afk", playerChangeAFKState);
@@ -708,15 +709,13 @@ function playerDamagedByPlayer(client, damagerEntityName, weaponId, pedPiece, he
             break;
 
         case VRR_WEAPON_DAMAGE_EVENT_NORMAL:
-            let reducedDamage = healthLoss*getPlayerData(client).incomingDamageMultiplier;
-            logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${reducedDamage})`);
-            getPlayerData(client).health = getPlayerData(client).health-reducedDamage;
-            setPlayerHealth(client, getPlayerData(client).health);
+            logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${(healthLoss*getPlayerData(client).incomingDamageMultiplier)})`);
+            setPlayerHealth(client, getPlayerHealth(client)-(healthLoss*getPlayerData(client).incomingDamageMultiplier));
             break;
 
         default:
-            getPlayerData(client).health = getPlayerData(client).health-(healthLoss*getPlayerData(client).incomingDamageMultiplier);
-            setPlayerHealth(client, getPlayerData(client).health);
+            logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${(healthLoss*getPlayerData(client).incomingDamageMultiplier)})`);
+            setPlayerHealth(client, getPlayerHealth(client)-(healthLoss*getPlayerData(client).incomingDamageMultiplier));
             break;
     }
 }