merge conflict

2021-04-22 16:39:18 +02:00
parent 3930e005cc
commit 4dc7ecd824
2 changed files with 12 additions and 0 deletions
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -7,6 +7,11 @@
        player.setSuffersCriticalHits(false);
    });

+    mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
+        mp.events.call('checkPosition', targetEntity);
+        return true;
+    });
+
    mp.events.add("render", () => {
        if (blockInput) {
            mp.game.controls.disableControlAction(32, 142, true);