Merge branch 'master' into refactor-namechange-bans

sapphonie · Oct 22, 2024 · 09eb372 · 09eb372
2 parents 6ab77d2 + aaf88c2
commit 09eb372
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup SourcePawn Compiler
       uses: rumblefrog/setup-sp@master
       with:
-        version: "1.11.x"
+        version: "1.12.x"
 
     - name: Compile plugins
       run: |

diff --git a/scripting/stac.sp b/scripting/stac.sp
@@ -55,7 +55,7 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#define PLUGIN_VERSION  "6.1.7-namechangelogic-beta"
+#define PLUGIN_VERSION  "6.2.0"
 
 #define UPDATE_URL      "https://raw.githubusercontent.com/sapphonie/StAC-tf2/master/updatefile.txt"
 

diff --git a/scripting/stac/stac_cvar_checks.sp b/scripting/stac/stac_cvar_checks.sp
@@ -30,6 +30,19 @@ char miscVars[][] =
     "r_portalsopenall",
     // must be == 1.0
     "host_timescale",
+
+    // 0
+    "net_blockmsg",
+    "net_droppackets",
+    "net_fakejitter",
+    "net_fakelag",
+    "net_fakeloss",
+
+    // 1
+    "r_skybox",
+    "r_drawskybox"
+
+
     // sv_force_transmit_ents ?
     // sv_suppress_viewpunch ?
     // tf_showspeed ?
@@ -274,9 +287,39 @@ public void ConVarCheck(QueryCookie cookie, int cl, ConVarQueryResult result, co
     }
 
     /*
-        cheat program only cvars
+        // 0
+        "net_blockmsg",
+        "net_droppackets",
+        "net_fakejitter",
+        "net_fakelag",
+        "net_fakeloss",
     */
+    else if (StrContains(cvarName, "net_") == 0 /* starts with "net_", doesn't just contain it */)
+    {
+        if (StringToInt(cvarValue) != 0)
+        {
+            oobVarsNotify(userid, cvarName, cvarValue);
+            if (stac_ban_for_misccheats.BoolValue)
+            {
+                oobVarBan(userid);
+            }
+        }
+    }
 
+    else if (StrEqual(cvarName, "r_skybox") || StrEqual(cvarName, "r_drawskybox"))
+    {
+        if (StringToInt(cvarValue) != 1)
+        {
+            oobVarsNotify(userid, cvarName, cvarValue);
+            if (stac_ban_for_misccheats.BoolValue)
+            {
+                oobVarBan(userid);
+            }
+        }
+    }
+    /*
+        cheat program only cvars
+    */
     if
     (
         (