From 9b3583765270f63a603e0b27d75a13079ac7d0c7 Mon Sep 17 00:00:00 2001
From: Sup6 <42062456+Sup66@users.noreply.github.com>
Date: Sun, 5 Jan 2020 00:24:19 +0200
Subject: [PATCH 1/4] Fixed guards spawn with every player

---
 __resource.lua            |  4 ++++
 spawning/cl_savezones.lua | 12 +++++-------
 spawning/cl_zombies.lua   |  2 +-
 spawning/sv_savezones.lua | 13 +++++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 spawning/sv_savezones.lua

diff --git a/__resource.lua b/__resource.lua
index 47c3023..4b9e337 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -13,4 +13,8 @@ client_scripts {
 	"spawning/cl_player.lua",
 	"spawning/cl_zombies.lua",
 	"spawning/cl_savezones.lua"
+}
+
+server_scripts{
+    "spawning/sv_savezones.lua"
 }
\ No newline at end of file
diff --git a/spawning/cl_savezones.lua b/spawning/cl_savezones.lua
index 404a686..9dc2eee 100644
--- a/spawning/cl_savezones.lua
+++ b/spawning/cl_savezones.lua
@@ -31,7 +31,7 @@ local function SpawnGuard(guardSpawn)
     DecorSetInt(guard, GUARDSPAWN_ID_DECOR, guardSpawn.Id)
 end
 
-local function HandleGuardSpawning()
+function HandleGuardSpawning()
     local untilPause = 10
     local spawnedIds = {}
     for ped, pedData in pairs(g_peds) do
@@ -55,6 +55,7 @@ local function HandleGuardSpawning()
 
     for _, safezone in ipairs(Config.Spawning.Safezones.SAFEZONES) do
         for _, guardSpawn in ipairs(safezone.GuardSpawns) do
+            
             if guardSpawn.Id and not spawnedIds[guardSpawn.Id] then
                 SpawnGuard(guardSpawn)
             end
@@ -62,12 +63,9 @@ local function HandleGuardSpawning()
     end
 end
 
-Utils.CreateLoadedInThread(function()
-    Wait(250)
-
-    if Player.IsSpawnHost() then
-        HandleGuardSpawning()
-    end
+RegisterNetEvent("GuardSpawn")
+AddEventHandler("GuardSpawn", function()
+    HandleGuardSpawning()
 end)
 
 Citizen.CreateThread(function()
diff --git a/spawning/cl_zombies.lua b/spawning/cl_zombies.lua
index b2271ef..7255a9b 100644
--- a/spawning/cl_zombies.lua
+++ b/spawning/cl_zombies.lua
@@ -31,7 +31,7 @@ local function ZombifyPed(ped)
     SetPedCombatAbility(ped, 2)
     SetPedCombatRange(ped, 2)
 
-    SetAiMeleeWeaponDamageModifier(9999.0)
+    SetAiMeleeWeaponDamageModifier(4.0)
     SetPedRagdollBlockingFlags(ped, 4)
     SetPedCanRagdollFromPlayerImpact(ped, false)
     SetPedCanPlayAmbientAnims(ped, false)
diff --git a/spawning/sv_savezones.lua b/spawning/sv_savezones.lua
new file mode 100644
index 0000000..0f480ec
--- /dev/null
+++ b/spawning/sv_savezones.lua
@@ -0,0 +1,13 @@
+Citizen.CreateThread(function()
+    Citizen.Wait(500)
+    local count = 0
+    local spawned = false
+    players = GetPlayers()
+    for _ in ipairs(players) do
+        count = count + 1
+        if count == 1 and spawned == false then
+            TriggerClientEvent("GuardSpawn", -1)
+            spawned = true
+        end
+    end
+end)
\ No newline at end of file

From 8e40352570de9bf0cc08c0be5f021e6d58a41cbe Mon Sep 17 00:00:00 2001
From: Sup6 <42062456+Sup66@users.noreply.github.com>
Date: Sun, 5 Jan 2020 00:25:02 +0200
Subject: [PATCH 2/4] Update cl_savezones.lua

---
 spawning/cl_savezones.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spawning/cl_savezones.lua b/spawning/cl_savezones.lua
index 9dc2eee..661c4fc 100644
--- a/spawning/cl_savezones.lua
+++ b/spawning/cl_savezones.lua
@@ -31,7 +31,7 @@ local function SpawnGuard(guardSpawn)
     DecorSetInt(guard, GUARDSPAWN_ID_DECOR, guardSpawn.Id)
 end
 
-function HandleGuardSpawning()
+local function HandleGuardSpawning()
     local untilPause = 10
     local spawnedIds = {}
     for ped, pedData in pairs(g_peds) do
@@ -86,4 +86,4 @@ Citizen.CreateThread(function()
             id = id + 1
         end
     end
-end)
\ No newline at end of file
+end)

From e5190b406dc9b840d79447519ea3a903dc9793c8 Mon Sep 17 00:00:00 2001
From: Sup6 <42062456+Sup66@users.noreply.github.com>
Date: Sun, 5 Jan 2020 00:26:18 +0200
Subject: [PATCH 3/4] Update cl_zombies.lua

---
 spawning/cl_zombies.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spawning/cl_zombies.lua b/spawning/cl_zombies.lua
index 7255a9b..29dbfdb 100644
--- a/spawning/cl_zombies.lua
+++ b/spawning/cl_zombies.lua
@@ -31,7 +31,7 @@ local function ZombifyPed(ped)
     SetPedCombatAbility(ped, 2)
     SetPedCombatRange(ped, 2)
 
-    SetAiMeleeWeaponDamageModifier(4.0)
+    SetAiMeleeWeaponDamageModifier(9999.0)
     SetPedRagdollBlockingFlags(ped, 4)
     SetPedCanRagdollFromPlayerImpact(ped, false)
     SetPedCanPlayAmbientAnims(ped, false)
@@ -180,4 +180,4 @@ Utils.CreateLoadedInThread(function()
             end
         end
     end
-end)
\ No newline at end of file
+end)

From e540b17ddf6315f8a974dbc449234764dc0198ae Mon Sep 17 00:00:00 2001
From: Sup6 <42062456+Sup66@users.noreply.github.com>
Date: Sun, 5 Jan 2020 02:45:54 +0200
Subject: [PATCH 4/4] Update sv_savezones.lua

---
 spawning/sv_savezones.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spawning/sv_savezones.lua b/spawning/sv_savezones.lua
index 0f480ec..246ac65 100644
--- a/spawning/sv_savezones.lua
+++ b/spawning/sv_savezones.lua
@@ -1,4 +1,5 @@
 Citizen.CreateThread(function()
+ while true do
     Citizen.Wait(500)
     local count = 0
     local spawned = false
@@ -10,4 +11,5 @@ Citizen.CreateThread(function()
             spawned = true
         end
     end
-end)
\ No newline at end of file
+end
+end)