From 5e6060b343a1f287ed9020899f96a5ca3031a6f7 Mon Sep 17 00:00:00 2001
From: TheOnly8Z <888888zombies@gmail.com>
Date: Thu, 22 Jun 2023 18:02:01 -0500
Subject: [PATCH] fix for upcoming update

---
 lua/arccw/server/sv_convar.lua       | 2 ++
 lua/arccw/server/sv_defaultclip.lua  | 2 ++
 lua/arccw/server/sv_doors.lua        | 2 ++
 lua/arccw/server/sv_garbage.lua      | 2 ++
 lua/arccw/server/sv_net.lua          | 2 ++
 lua/arccw/server/sv_npc.lua          | 2 ++
 lua/arccw/server/sv_sandbox.lua      | 2 ++
 lua/arccw/server/sv_singleplayer.lua | 6 ++----
 lua/arccw/server/sv_smoke.lua        | 2 ++
 lua/arccw/server/sv_takedamage.lua   | 2 ++
 lua/arccw/server/sv_year.lua         | 2 ++
 lua/autorun/arccw_autorun.lua        | 2 ++
 12 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lua/arccw/server/sv_convar.lua b/lua/arccw/server/sv_convar.lua
index 41ebb0f5..1389c7ea 100644
--- a/lua/arccw/server/sv_convar.lua
+++ b/lua/arccw/server/sv_convar.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 net.Receive("arccw_sendconvar", function(len, ply)
     local command = net.ReadString()
 
diff --git a/lua/arccw/server/sv_defaultclip.lua b/lua/arccw/server/sv_defaultclip.lua
index 2c459da6..aeca429d 100644
--- a/lua/arccw/server/sv_defaultclip.lua
+++ b/lua/arccw/server/sv_defaultclip.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 hook.Add("OnEntityCreated", "ArcCW_DefaultClip", function(ent)
     if !ent.ArcCW then return end
 
diff --git a/lua/arccw/server/sv_doors.lua b/lua/arccw/server/sv_doors.lua
index 2d80b4ef..8b04b28f 100644
--- a/lua/arccw/server/sv_doors.lua
+++ b/lua/arccw/server/sv_doors.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 function ArcCW.DoorBust(ent, vel)
     local cvar = GetConVar("arccw_doorbust"):GetInt()
     local t = GetConVar("arccw_doorbust_time"):GetFloat()
diff --git a/lua/arccw/server/sv_garbage.lua b/lua/arccw/server/sv_garbage.lua
index f576c6ed..cb1b6232 100644
--- a/lua/arccw/server/sv_garbage.lua
+++ b/lua/arccw/server/sv_garbage.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 ArcCW.ShieldPropPile    = {} -- { {Model = NULL, Weapon = NULL} }
 
 local function SV_ArcCW_CollectGarbage()
diff --git a/lua/arccw/server/sv_net.lua b/lua/arccw/server/sv_net.lua
index 25d161f3..4595b62a 100644
--- a/lua/arccw/server/sv_net.lua
+++ b/lua/arccw/server/sv_net.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 if game.SinglePlayer() then
 
 util.AddNetworkString("arccw_sp_lhikanim")
diff --git a/lua/arccw/server/sv_npc.lua b/lua/arccw/server/sv_npc.lua
index 5e429618..3cce6c7a 100644
--- a/lua/arccw/server/sv_npc.lua
+++ b/lua/arccw/server/sv_npc.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 ArcCW.RandomWeaponCache = {}
 
 hook.Add("PlayerSpawnedNPC", "ArcCW_PlayerSpawnedNPC", function( ply, ent )
diff --git a/lua/arccw/server/sv_sandbox.lua b/lua/arccw/server/sv_sandbox.lua
index ae8d1c74..2060117f 100644
--- a/lua/arccw/server/sv_sandbox.lua
+++ b/lua/arccw/server/sv_sandbox.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 -- We have to do a timer because there is no "PlayerGivenSWEP" or similar
 hook.Add("PlayerGiveSWEP", "ArcCW_Autoload", function(ply, class, tbl)
     local weptbl = weapons.Get(class)
diff --git a/lua/arccw/server/sv_singleplayer.lua b/lua/arccw/server/sv_singleplayer.lua
index b69069bd..55803aa1 100644
--- a/lua/arccw/server/sv_singleplayer.lua
+++ b/lua/arccw/server/sv_singleplayer.lua
@@ -1,4 +1,4 @@
-if game.SinglePlayer() then
+if CLIENT or !game.SinglePlayer() then return end
 
 hook.Add("EntityTakeDamage", "ArcCW_ETD", function(npc, dmg)
     timer.Simple(0, function()
@@ -9,6 +9,4 @@ hook.Add("EntityTakeDamage", "ArcCW_ETD", function(npc, dmg)
             net.Broadcast()
         end
     end)
-end)
-
-end
\ No newline at end of file
+end)
\ No newline at end of file
diff --git a/lua/arccw/server/sv_smoke.lua b/lua/arccw/server/sv_smoke.lua
index 50c970e2..0411796f 100644
--- a/lua/arccw/server/sv_smoke.lua
+++ b/lua/arccw/server/sv_smoke.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 ArcCW.NPCsCache = ArcCW.NPCsCache or {}
 local npcs = ArcCW.NPCsCache
 
diff --git a/lua/arccw/server/sv_takedamage.lua b/lua/arccw/server/sv_takedamage.lua
index 79eaba5d..04128d80 100644
--- a/lua/arccw/server/sv_takedamage.lua
+++ b/lua/arccw/server/sv_takedamage.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 hook.Add("EntityTakeDamage", "ArcCW_DoAttDMG", function(ent, dmg)
     if !ent:IsPlayer() then return end
 
diff --git a/lua/arccw/server/sv_year.lua b/lua/arccw/server/sv_year.lua
index 2e38a111..2ce001b4 100644
--- a/lua/arccw/server/sv_year.lua
+++ b/lua/arccw/server/sv_year.lua
@@ -1,3 +1,5 @@
+if CLIENT then return end
+
 hook.Add( "PlayerGiveSWEP", "ArcCW_YearLimiter", function( ply, class, swep )
     local wep = weapons.Get(class)
 
diff --git a/lua/autorun/arccw_autorun.lua b/lua/autorun/arccw_autorun.lua
index 18af7c0e..17111b62 100644
--- a/lua/autorun/arccw_autorun.lua
+++ b/lua/autorun/arccw_autorun.lua
@@ -19,6 +19,7 @@ for _, v in pairs(file.Find("arccw/client/*", "LUA")) do
     end
 end
 
+-- TODO: Remove SP check after upcoming June 2023 update
 if SERVER or game.SinglePlayer() then
     for _, v in pairs(file.Find("arccw/server/*", "LUA")) do
         include("arccw/server/" .. v)
@@ -39,6 +40,7 @@ for _, v in pairs(file.Find("arccw/mods/client/*", "LUA")) do
     end
 end
 
+-- TODO: Remove SP check after upcoming June 2023 update
 if SERVER or game.SinglePlayer() then
     for _, v in pairs(file.Find("arccw/mods/server/*", "LUA")) do
         include("arccw/mods/server/" .. v)