From 44609e0ee6c0c147c3f54adb568d401d3457116d Mon Sep 17 00:00:00 2001
From: Fabian <balbo@life-of-german.org>
Date: Thu, 22 Apr 2021 16:52:06 +0200
Subject: [PATCH] test nodm zone kein schaden

---
 ReallifeGamemode.Client/Player/position.ts   |  8 --------
 ReallifeGamemode.Client/util/weapondamage.ts | 10 +++++++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ReallifeGamemode.Client/Player/position.ts b/ReallifeGamemode.Client/Player/position.ts
index d6343ddb..8c8cf4a3 100644
--- a/ReallifeGamemode.Client/Player/position.ts
+++ b/ReallifeGamemode.Client/Player/position.ts
@@ -8,14 +8,6 @@ export function isPlayerInNoDMZone(pos) {
 }
 
 export default function positionHandler() {
-
-    mp.events.add("checkPosition", (targetEntity) => {
-
-        if (isPlayerInNoDMZone(mp.players.local.position) || isPlayerInNoDMZone(targetEntity.position)) {
-            mp.gui.chat.push("Kein DM in NODM!");
-        }
-    });
-
     setInterval(() => {
         mp.events.call('toggleNoDmZone', isPlayerInNoDMZone(mp.players.local.position));
     }, 200);
diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts
index 013b0dd5..f1704e9a 100644
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -1,4 +1,6 @@
-export default function weapondamageUtil() {
+import { isPlayerInNoDMZone } from "../Player/position";
+
+export default function weapondamageUtil() {
     let blockInput = false;
 
     mp.players.local.setSuffersCriticalHits(false);
@@ -8,8 +10,10 @@
     });
 
     mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
-        mp.events.call('checkPosition', targetEntity);
-        return true;
+        if (isPlayerInNoDMZone(targetEntity.position) || isPlayerInNoDMZone(sourceEntity.position)) {
+            mp.gui.chat.push("Kein DM in NODM!");
+            return true;
+        }
     });
 
     mp.events.add("render", () => {