spawnschutz bei login, revive und spawn nach kh

ReallifeGamemode.Client/Login/main.ts

@@ -71,5 +71,6 @@ export default function (globalData: IGlobalData): void {
         mp.game.cam.renderScriptCams(false, false, 0, true, false);
 
         mp.events.call("toggleSpawnschutz", true);
+        mp.events.call("triggerSpawnschutzTimer");
     });
 }

ReallifeGamemode.Client/Player/spawnschutz.ts

@@ -2,8 +2,10 @@
 
 export default function spawnschutz() {
 
-    setInterval(() => {
+    mp.events.add("triggerSpawnschutzTimer", () => {
+        var spawnschutzTimer = setTimeout(() => {
             mp.events.call("toggleSpawnschutz", false);
             spawnschutzEnabled = false;
         }, 60000);
+    });
 }   

ReallifeGamemode.Client/util/weapondamage.ts

@@ -32,7 +32,13 @@ export default function weapondamageUtil() {
             return true;
         }
 
-        if (spawnschutzEnabled) {
+        if (spawnschutzEnabled && getWantedCount() === 0) {
+            return true;
+        }
+    });
+
+    mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
+        if (spawnschutzEnabled && getWantedCount() === 0) {
             return true;
         }
     });

ReallifeGamemode.Server/Commands/FactionCommands.cs

@@ -426,6 +426,9 @@ namespace ReallifeGamemode.Server.Commands
         deadPlayer.SetData("isDead", false);
         deadPlayer.SetData("reviveSperre", 5);
 
+        deadPlayer.TriggerEvent("toggleSpawnschutz", true);
+        deadPlayer.TriggerEvent("triggerSpawnschutzTimer");
+
         dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;
 
         User u;

ReallifeGamemode.Server/Events/Death.cs

@@ -244,6 +244,9 @@ namespace ReallifeGamemode.Server.Events
       }
 
       player.SafeTeleport(new Vector3(-495.45, -336.33, 34.5), 0, true);
+
+      player.TriggerEvent("toggleSpawnschutz", true);
+      player.TriggerEvent("triggerSpawnschutzTimer");
     }
   }
 }