Merge remote-tracking branch 'origin/main' into fix-leak

Author: roflmuffin

.gitattributes

@@ -0,0 +1 @@
+managed/CounterStrikeSharp.API/Generated/**/*.cs text eol=crlf

.github/workflows/sync-schema.yaml

@@ -0,0 +1,84 @@
+name: Synchronize - Schema
+
+on:
+  schedule:
+    - cron: '0 8 * * *'
+  workflow_dispatch:
+
+jobs:
+  update-schema:
+    runs-on: ubuntu-latest
+    if: github.repository == 'roflmuffin/CounterStrikeSharp'
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Install lftp
+        run: sudo apt-get update && sudo apt-get install -y lftp
+
+      - name: Run schema update script
+        env:
+          GS_HOST: ${{ secrets.GS_HOST }}
+          GS_PORT: ${{ secrets.GS_PORT }}
+          GS_PASS: ${{ secrets.GS_PASS }}
+          SFTP_HOST: ${{ secrets.SFTP_HOST }}
+          SFTP_USER: ${{ secrets.SFTP_USER }}
+          SFTP_PASS: ${{ secrets.SFTP_PASS }}
+        run: |
+          mkdir -p ~/.lftp
+          echo "set sftp:auto-confirm yes" >> ~/.lftp/rc
+          echo "set ssl:verify-certificate no" >> ~/.lftp/rc
+          chmod +x eng/update-schema.sh
+          chmod +x eng/rcon
+          ./eng/update-schema.sh
+
+      - name: Get patch version
+        id: version
+        run: |
+          PATCH_VERSION=$(jq -r ".game_info.PatchVersion" managed/CounterStrikeSharp.SchemaGen/Schema/server.json)
+          echo "patch_version=$PATCH_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Check for changes
+        id: changes
+        run: |
+          if [[ -n $(git status --porcelain managed/CounterStrikeSharp.API/Generated/) ]]; then
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+            echo "Changes detected in Generated folder:"
+            git status --porcelain managed/CounterStrikeSharp.API/Generated/
+          else
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Pull Request
+        if: steps.changes.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.AUTOMATED_PR_PAT }}
+          author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
+          commit-message: "chore: update schema definitions to ${{ steps.version.outputs.patch_version }}"
+          title: "chore: Update Schema Definitions to ${{ steps.version.outputs.patch_version }}"
+          body: |
+            This PR was automatically generated by the schema update workflow.
+            
+            ## Changes
+            - Updated schema definitions from the game server
+            - Regenerated schema code using `CounterStrikeSharp.SchemaGen`
+            - Patch Version: `${{ steps.version.outputs.patch_version }}`
+            
+            ---
+            *This is an automated PR. Please review the changes before merging.*
+          branch: chore/automated/schema-update
+          delete-branch: true
+
+      - name: No changes detected
+        if: steps.changes.outputs.has_changes == 'false'
+        run: echo "::notice::No schema changes detected. No PR will be created."

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 .ccls-cache/
 .cmake/
 cmake-build-*/

CHANGELOG.md

@@ -1,3 +1,20 @@
+## What's Changed in v1.0.361
+* fix: setup server next frame listeners at startup ([dc138c1](https://github.com/roflmuffin/CounterStrikeSharp/commit/dc138c16f3e63ce2fb8f364da5c1d418a3214d84))
+
+## What's Changed in v1.0.360
+* fix: update windows signatures for CCSPlayerPawnBase and CCSGameRules by [@K4ryuu](https://github.com/K4ryuu) in [#1199](https://github.com/roflmuffin/CounterStrikeSharp/pull/1199) ([9841c92](https://github.com/roflmuffin/CounterStrikeSharp/commit/9841c92e2da1d1f389f2374e4fb0f556f2a3e1a5))
+
+## What's Changed in v1.0.359
+* fix: update set state changed offset for linux ([3262827](https://github.com/roflmuffin/CounterStrikeSharp/commit/326282757fe094cc2eabfcb32fc8e86f6db9aabe))
+
+## What's Changed in v1.0.358
+* fix: CPlayerPawnComponent pawn reference ([1614e5c](https://github.com/roflmuffin/CounterStrikeSharp/commit/1614e5c50c8f80063902fe282b28dafd46ad0135))
+
+## What's Changed in v1.0.357
+* fix(schema): update schema after followup update ([c1d6bf4](https://github.com/roflmuffin/CounterStrikeSharp/commit/c1d6bf4f838de75382e91f8232bbe2f9b96d2b0f))
+* fix: bump sdk & update gamedata for patch 1.41.3.x in [#1187](https://github.com/roflmuffin/CounterStrikeSharp/pull/1187) ([fe3e32f](https://github.com/roflmuffin/CounterStrikeSharp/commit/fe3e32f37984da992c6ec331525252eadc18c509))
+* fix(schema): update schema for 1.41.3.0 ([f9617b9](https://github.com/roflmuffin/CounterStrikeSharp/commit/f9617b9a7e52d30d5c5c4433aa8c7ce0e3ad7e16))
+
 ## What's Changed in v1.0.356
 * feat: adds configurable limit to `NextFrame` tasks allowed to execute per frame ([925fec0](https://github.com/roflmuffin/CounterStrikeSharp/commit/925fec04801fc09ce294051055b761069fcb733f))
 * chore(deps): bump libraries/hl2sdk-cs2 from `6e735c1` to `aba345d` by [@dependabot[bot]](https://github.com/dependabot[bot]) in [#1170](https://github.com/roflmuffin/CounterStrikeSharp/pull/1170) ([2eea759](https://github.com/roflmuffin/CounterStrikeSharp/commit/2eea759a2c8cc61bd2679157b78a6e4fb1f51a0e))

configs/addons/counterstrikesharp/gamedata/gamedata.json

@@ -22,28 +22,28 @@
   },
   "CCSPlayerController_ChangeTeam": {
     "offsets": {
-      "windows": 109,
-      "linux": 108
+      "windows": 102,
+      "linux": 101
     }
   },
   "CCSPlayerController_Respawn": {
     "offsets": {
-      "windows": 277,
-      "linux": 279
+      "windows": 272,
+      "linux": 274
     }
   },
   "CBasePlayerController_SetPawn": {
     "signatures": {
       "library": "server",
       "windows": "44 88 4C 24 ? 53 57",
-      "linux": "55 48 8D 87 ? ? ? ? 48 89 E5 41 57 41 56 41 89 CE 41 55 45 89 CD"
+      "linux": "55 48 8D 87 ? ? ? ? 48 89 E5 41 57 41 89 CF"
     }
   },
   "CCSPlayerPawnBase_PostThink": {
     "signatures": {
       "library": "server",
-      "windows": "48 ? ? 55 53 56 57 41 ? 48 ? ? ? 48 ? ? ? ? ? ? 4C 89 68",
-      "linux": "55 48 89 E5 41 56 41 55 41 54 53 48 89 FB 48 83 EC 40 E8 ? ? ? ? F3 0F 10 83"
+      "windows": "48 8B C4 55 53 56 57 41 54 48 8D 68 ? 48 81 EC ? ? ? ? 4C 89 68 ? 48 8B F9",
+      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 41 55 41 54 53 48 81 EC ? ? ? ? E8 ? ? ? ? 41 80 BF"
     }
   },
   "CGameEventManager_Init": {
@@ -92,37 +92,37 @@
     "signatures": {
       "library": "server",
       "windows": "48 89 5C 24 ? 57 48 83 EC ? 33 FF 4C 8B CA 8B D9",
-      "linux": "55 31 D2 48 89 E5 41 56 41 55 41 54"
+      "linux": "55 31 D2 48 89 E5 41 57 41 56 41 55 41 54 41 89 FC"
     }
   },
   "CCSPlayer_ItemServices_GiveNamedItem": {
     "offsets": {
-      "windows": 18,
-      "linux": 19
+      "windows": 19,
+      "linux": 20
     }
   },
   "CCSPlayer_ItemServices_DropActivePlayerWeapon": {
     "offsets": {
-      "windows": 21,
-      "linux": 22
+      "windows": 22,
+      "linux": 23
     }
   },
   "CCSPlayer_ItemServices_RemoveWeapons": {
     "offsets": {
-      "windows": 22,
-      "linux": 23
+      "windows": 23,
+      "linux": 24
     }
   },
   "CGameSceneNode_GetSkeletonInstance": {
     "offsets": {
       "windows": 8,
-      "linux": 8
+      "linux": 9
     }
   },
   "CCSGameRules_TerminateRound": {
     "signatures": {
       "library": "server",
-      "windows": "48 8B C4 4C 89 48 ? 48 89 48 ? 55 56",
+      "windows": "48 8B C4 4C 89 48 ? 48 89 48 ? 55 56 41 56",
       "linux": "55 48 89 E5 41 57 41 56 49 89 FE 41 55 41 54 53 48 81 EC ? ? ? ? 48 8D 05 ? ? ? ? F3 0F 11 85"
     }
   },
@@ -168,8 +168,8 @@
   },
   "CBaseEntity_IsPlayerPawn": {
     "offsets": {
-      "windows": 174,
-      "linux": 173
+      "windows": 168,
+      "linux": 167
     }
   },
   "CEntitySystem_AddEntityIOEvent": {
@@ -182,14 +182,14 @@
   "LegacyGameEventListener": {
     "signatures": {
       "library": "server",
-      "windows": "48 8B 15 ? ? ? ? 48 85 D2 74 ? 83 F9 ? 77 ? 48 63 C1 48 C1 E0",
+      "windows": "48 8B 15 ? ? ? ? 48 85 D2 74 ? 83 F9 ? 77",
       "linux": "48 8B 05 ? ? ? ? 48 85 C0 74 ? 83 FF ? 77 ? 48 63 FF 48 C1 E7 ? 48 8D 44 38"
     }
   },
   "CBasePlayerPawn_CommitSuicide": {
     "offsets": {
-      "windows": 408,
-      "linux": 408
+      "windows": 400,
+      "linux": 400
     }
   },
   "CBasePlayerPawn_RemovePlayerItem": {
@@ -201,15 +201,15 @@
   },
   "CBaseEntity_Teleport": {
     "offsets": {
-      "windows": 168,
-      "linux": 167
+      "windows": 162,
+      "linux": 161
     }
   },
   "CBaseEntity_TakeDamageOld": {
     "signatures": {
       "library": "server",
       "windows": "40 55 41 54 41 55 41 56 41 57 48 81 EC ? ? ? ? 48 8D 6C 24 ? 48 89 9D ? ? ? ? 45 33 ED",
-      "linux": "55 48 89 E5 41 57 41 56 49 89 F6 41 55 41 54 49 89 FC 53 48 89 D3 48 83 EC ? 48 85 D2"
+      "linux": "55 48 89 E5 41 57 41 56 41 55 49 89 FD 41 54 49 89 F4 53 48 89 D3 48 83 EC ? 48 85 D2"
     }
   },
   "CBaseTrigger_StartTouch": {
@@ -242,7 +242,7 @@
     "signatures": {
       "library": "server",
       "windows": "4C 89 4C 24 ? 48 89 4C 24 ? 53 56",
-      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 41 55 41 54 49 89 D4 53 48 89 F3"
+      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 41 55 41 54 49 89 D4 53 48 89 F3 48 83 EC ? 48 8D 05"
     }
   },
   "IGameSystem_InitAllSystems_pFirst": {
@@ -280,8 +280,8 @@
   },
   "SetStateChanged": {
     "offsets": {
-      "windows": 25,
-      "linux": 26
+      "windows": 27,
+      "linux": 28
     }
   },
   "ISource2GameEntities::CheckTransmit": {

eng/rcon

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+HERE=`dirname $0`
+
+set -a
+[ -f .env ] && source .env
+set +a
+
+set -e 
+set -u
+
+# Game server RCON details - must come from the environment
+: "${GS_HOST:?GS_HOST env var is required}"
+: "${GS_PORT:?GS_PORT env var is required}"
+: "${GS_PASS:?GS_PASS env var is required}"
+
+# SFTP connection details - must come from the environment
+: "${SFTP_HOST:?SFTP_HOST env var is required}"
+: "${SFTP_USER:?SFTP_USER env var is required}"
+: "${SFTP_PASS:?SFTP_PASS env var is required}"
+
+OUTPUT=$($HERE/rcon -a $GS_HOST:$GS_PORT -p $GS_PASS "dump_schema all")
+FILEPATH=$(echo "$OUTPUT" | grep -oP 'Wrote file output to \K.*')
+TRIMMED_PATH="${FILEPATH#/home/container}"
+
+lftp -u "$SFTP_USER,$SFTP_PASS" "$SFTP_HOST" <<EOF
+set xfer:clobber on
+get "$TRIMMED_PATH" -o "$HERE/../managed/CounterStrikeSharp.SchemaGen/Schema/server.json"
+bye
+EOF
+
+dotnet run --project $HERE/../managed/CounterStrikeSharp.SchemaGen/CounterStrikeSharp.SchemaGen.csproj -- "$HERE/../managed/CounterStrikeSharp.API/Generated/Schema"