fix: concommand crash when no description

Co-authored-by: Michael Wilson <roflmuffin@users.noreply.github.com>

.clang-format

@@ -1,21 +1,72 @@
 BasedOnStyle: LLVM
+
+# Spacing
 IndentWidth: 4
-ColumnLimit: 100
+UseTab: Never
+ColumnLimit: 140
+
+# Line Endings
+LineEnding: LF
+InsertNewlineAtEOF: true
 DerivePointerAlignment: false
-PointerAlignment: Left
+
 AlignAfterOpenBracket: Align
 KeepEmptyLinesAtTheStartOfBlocks: false
-SortIncludes: false
 SpaceBeforeParens: ControlStatements
 AllowAllArgumentsOnNextLine: true
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: false
+IndentCaseLabels: true
+
+# Line Breaks
 BreakBeforeBraces: Custom
 BraceWrapping:
+  AfterCaseLabel: true
   AfterClass: true
-  AfterStruct: true
+  AfterControlStatement: Always
   AfterEnum: true
-  AfterUnion: true
-  AfterNamespace: false
   AfterFunction: true
+  AfterNamespace: false
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: false
   IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+
+PointerAlignment: Left
+SortIncludes: CaseSensitive
+IncludeBlocks: Regroup
+IncludeCategories:
+  # External headers in <> with extension or /
+  - Regex: '<[-\w\/-_]+[\.\/][-\w\/-_]+>'
+    Priority: 2
+  # Standard headers in <>
+  - Regex: '<[-\w\/-_]+>'
+    Priority: 3
+  # Local headers in ""
+  - Regex: '"[-\w\/-_]*"'
+    Priority: 4
+
+ReflowComments: true
+CompactNamespaces: false
+Cpp11BracedListStyle: false
+
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+
+AlignEscapedNewlines: Left
+AlignTrailingComments: Never
+
+AllowShortBlocksOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: OnlyFirstIf
+AllowShortLambdasOnASingleLine: Empty
+BinPackArguments: true
+BinPackParameters: false
+
+LambdaBodyIndentation: OuterScope

.editorconfig

@@ -0,0 +1,14 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+max_line_length = 140
+trim_trailing_whitespace = true
+
+[*.json]
+indent_size = 2

.github/workflows/cmake-single-platform.yml

@@ -3,22 +3,46 @@ name: Build & Publish
 on:
   push:
     paths-ignore:
-      - 'docfx/**'
-    branches: [ "main", "dev" ]
+      - "docfx/**"
+    branches: ["main", "dev"]
   pull_request:
-    branches: [ "main", "dev" ]
+    branches: ["main", "dev"]
 
 env:
   BUILD_TYPE: Release
 
 jobs:
+  setup:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    outputs:
+      buildnumber: ${{ steps.buildnumber.outputs.build_number }}
+    steps:
+      - name: Generate build number
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        id: buildnumber
+        uses: onyxmueller/build-tag-number@v1
+        with:
+          token: ${{secrets.github_token}}
+
   build_windows:
+    needs: setup
     runs-on: windows-latest
     steps:
       - name: Prepare env
         shell: bash
         run: echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
+      - name: Fallback build number
+        if: ${{ github.event_name == 'pull_request' || github.ref != 'refs/heads/main' }}
+        shell: bash
+        run: echo "BUILD_NUMBER=0" >> $GITHUB_ENV
+
+      - name: Main build number
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: echo "BUILD_NUMBER=${{ needs.setup.outputs.buildnumber }}" >> $GITHUB_ENV
+
       - name: Visual Studio environment
         shell: cmd
         run: |
@@ -34,7 +58,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Build
         run: |
@@ -56,6 +80,7 @@ jobs:
           path: build/output/
 
   build_linux:
+    needs: setup
     runs-on: ubuntu-latest
     # Could not figure out how to run in a container only on some matrix paths, so I've split it out into its own build.
     container:
@@ -65,9 +90,18 @@ jobs:
         shell: bash
         run: echo "GITHUB_SHA_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
+      - name: Fallback build number
+        if: ${{ github.event_name == 'pull_request' || github.ref != 'refs/heads/main' }}
+        shell: bash
+        run: echo "BUILD_NUMBER=0" >> $GITHUB_ENV
+
+      - name: Main build number
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: echo "BUILD_NUMBER=${{ needs.setup.outputs.buildnumber }}" >> $GITHUB_ENV
+
       - uses: actions/checkout@v3
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Build
         run: |
@@ -87,11 +121,10 @@ jobs:
           path: build/output/
 
   build_managed:
+    needs: setup
     permissions:
       contents: write
     runs-on: ubuntu-latest
-    outputs:
-      buildnumber: ${{ steps.buildnumber.outputs.build_number }}
     steps:
       - name: Prepare env
         shell: bash
@@ -102,20 +135,17 @@ jobs:
         shell: bash
         run: echo "BUILD_NUMBER=0" >> $GITHUB_ENV
 
+      - name: Main build number
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: echo "BUILD_NUMBER=${{ needs.setup.outputs.buildnumber }}" >> $GITHUB_ENV
+
       # We don't need expensive submodules for the managed side.
       - uses: actions/checkout@v3
 
-      - name: Generate build number
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        id: buildnumber
-        uses: onyxmueller/build-tag-number@v1
-        with:
-          token: ${{secrets.github_token}}
-
       - name: Build runtime v${{ env.BUILD_NUMBER }}
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: "8.0.x"
 
       - name: Install dependencies
         run: dotnet restore managed/CounterStrikeSharp.sln
@@ -133,7 +163,7 @@ jobs:
       - name: Publish artifacts
         run: |
           dotnet publish -c Release /p:Version=1.0.${{ env.BUILD_NUMBER }} managed/CounterStrikeSharp.API
-          dotnet pack -c Release /p:Version=1.0.${{ env.BUILD_NUMBER }} managed/CounterStrikeSharp.API   
+          dotnet pack -c Release /p:Version=1.0.${{ env.BUILD_NUMBER }} managed/CounterStrikeSharp.API
 
       - uses: actions/upload-artifact@v3
         with:
@@ -144,7 +174,7 @@ jobs:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
     permissions:
       contents: write
-    needs: [ "build_linux", "build_windows", "build_managed" ]
+    needs: ["setup", "build_linux", "build_windows", "build_managed"]
     runs-on: ubuntu-latest
     steps:
       - name: Prepare env
@@ -171,49 +201,48 @@ jobs:
         run: |
           mkdir -p build/linux/addons/counterstrikesharp/api
           mkdir -p build/windows/addons/counterstrikesharp/api
-          cp -r build/api/net7.0/publish/* build/linux/addons/counterstrikesharp/api
-          cp -r build/api/net7.0/publish/* build/windows/addons/counterstrikesharp/api
+          cp -r build/api/net8.0/publish/* build/linux/addons/counterstrikesharp/api
+          cp -r build/api/net8.0/publish/* build/windows/addons/counterstrikesharp/api
 
       - name: Zip Builds
         run: |
-          (cd build/linux && zip -qq -r ../../counterstrikesharp-build-${{ needs.build_managed.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip *)
-          (cd build/windows && zip -qq -r ../../counterstrikesharp-build-${{ needs.build_managed.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip *)
+          (cd build/linux && zip -qq -r ../../counterstrikesharp-build-${{ needs.setup.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip *)
+          (cd build/windows && zip -qq -r ../../counterstrikesharp-build-${{ needs.setup.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip *)
 
       - name: Add dotnet runtime
         run: |
           mkdir -p build/linux/addons/counterstrikesharp/dotnet
-          curl -s -L https://download.visualstudio.microsoft.com/download/pr/dc2c0a53-85a8-4fda-a283-fa28adb5fbe2/8ccade5bc400a5bb40cd9240f003b45c/aspnetcore-runtime-7.0.11-linux-x64.tar.gz \
+          curl -s -L https://download.visualstudio.microsoft.com/download/pr/c1371dc2-eed2-47be-9af3-ae060dbe3c7d/bd509e0a87629764ed47608466d183e6/aspnetcore-runtime-8.0.3-linux-x64.tar.gz \
           | tar xvz -C build/linux/addons/counterstrikesharp/dotnet
-          mv build/linux/addons/counterstrikesharp/dotnet/shared/Microsoft.NETCore.App/7.0.11/* build/linux/addons/counterstrikesharp/dotnet/shared/Microsoft.NETCore.App/
-          
+
           mkdir -p build/windows/addons/counterstrikesharp/dotnet
-          curl -s -L https://download.visualstudio.microsoft.com/download/pr/a99861c8-2e00-4587-aaef-60366ca77307/a44ceec2c5d34165ae881600f52edc43/aspnetcore-runtime-7.0.11-win-x64.zip -o dotnet.zip
+          curl -s -L https://download.visualstudio.microsoft.com/download/pr/086d1dd6-57a5-437a-a1ef-549cf702fb48/dd4a8fe6c53a1016a414d6f2925c1323/aspnetcore-runtime-8.0.3-win-x64.zip -o dotnet.zip
           unzip -qq dotnet.zip -d build/windows/addons/counterstrikesharp/dotnet
 
       - name: Zip Builds
         run: |
-          (cd build/linux && zip -qq -r ../../counterstrikesharp-with-runtime-build-${{ needs.build_managed.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip *)
-          (cd build/windows && zip -qq -r ../../counterstrikesharp-with-runtime-build-${{ needs.build_managed.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip *)
+          (cd build/linux && zip -qq -r ../../counterstrikesharp-with-runtime-build-${{ needs.setup.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip *)
+          (cd build/windows && zip -qq -r ../../counterstrikesharp-with-runtime-build-${{ needs.setup.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip *)
 
       - name: Release
         id: release
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: v${{ needs.build_managed.outputs.buildnumber }}
+          tag_name: v${{ needs.setup.outputs.buildnumber }}
           files: |
-            counterstrikesharp-build-${{ needs.build_managed.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip
-            counterstrikesharp-with-runtime-build-${{ needs.build_managed.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip
-            counterstrikesharp-build-${{ needs.build_managed.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip
-            counterstrikesharp-with-runtime-build-${{ needs.build_managed.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip
+            counterstrikesharp-build-${{ needs.setup.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip
+            counterstrikesharp-with-runtime-build-${{ needs.setup.outputs.buildnumber }}-windows-${{ env.GITHUB_SHA_SHORT }}.zip
+            counterstrikesharp-build-${{ needs.setup.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip
+            counterstrikesharp-with-runtime-build-${{ needs.setup.outputs.buildnumber }}-linux-${{ env.GITHUB_SHA_SHORT }}.zip
 
       - name: Publish NuGet package
         run: |
-          dotnet nuget push build/api/CounterStrikeSharp.API.1.0.${{ needs.build_managed.outputs.buildnumber }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
-          dotnet nuget push build/api/CounterStrikeSharp.API.1.0.${{ needs.build_managed.outputs.buildnumber }}.snupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+          dotnet nuget push build/api/CounterStrikeSharp.API.1.0.${{ needs.setup.outputs.buildnumber }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+          dotnet nuget push build/api/CounterStrikeSharp.API.1.0.${{ needs.setup.outputs.buildnumber }}.snupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
 
       - name: Send Notification to Discord
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.2
         with:
-          args: "A new release of CS# has been tagged (v${{ needs.build_managed.outputs.buildnumber }}) at ${{ steps.release.outputs.url }}"
+          args: "A new release of CS# has been tagged (v${{ needs.setup.outputs.buildnumber }}) at ${{ steps.release.outputs.url }}"

.gitignore

@@ -1,8 +1,7 @@
 .ccls-cache/
 .cmake/
-cmake-build-debug*/
+cmake-build-*/
 .kdev4/
-.vscode/
 generated/
 
 # configure_file auto generated.

.gitmodules

@@ -14,12 +14,12 @@
 [submodule "libraries/dyncall"]
 	path = libraries/dyncall
 	url = https://github.com/LWJGL-CI/dyncall
-[submodule "libraries/GameTracking-CS2"]
-	path = libraries/GameTracking-CS2
-	url = https://github.com/SteamDatabase/GameTracking-CS2
 [submodule "libraries/DynoHook"]
 	path = libraries/DynoHook
 	url = https://github.com/qubka/DynoHook
 [submodule "libraries/asmjit"]
 	path = libraries/asmjit
 	url = https://github.com/asmjit/asmjit
+[submodule "libraries/Protobufs"]
+	path = libraries/Protobufs
+	url = https://github.com/SteamDatabase/Protobufs

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.defaultFormatter": null,
+  "editor.formatOnSave": true
+}

CMakeLists.txt

@@ -5,6 +5,8 @@ project(counterstrikesharp C CXX ASM)
 
 include("makefiles/shared.cmake")
 
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
 add_subdirectory(libraries/spdlog)
 add_subdirectory(libraries/dyncall)
 add_subdirectory(libraries/funchook)
@@ -13,7 +15,8 @@ add_subdirectory(libraries/DynoHook)
 set_property(TARGET dynohook PROPERTY DYNO_ARCH_X86 64)
 set_property(TARGET funchook-static PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-SET(SOURCE_FILES
+set(SOURCE_FILES
+    libraries/hl2sdk-cs2/public/tier0/memoverride.cpp
     src/mm_plugin.cpp
     src/mm_plugin.h
     libraries/hl2sdk-cs2/tier1/convar.cpp
@@ -49,6 +52,8 @@ SET(SOURCE_FILES
     src/core/managers/event_manager.cpp
     src/core/timer_system.h
     src/core/timer_system.cpp
+    src/core/tick_scheduler.h
+    src/core/tick_scheduler.cpp
     src/scripting/autonative.h
     src/scripting/natives/natives_engine.cpp
     src/core/engine_trace.h
@@ -68,7 +73,6 @@ SET(SOURCE_FILES
     src/core/memory_module.h
     src/core/memory_module.cpp
     src/core/cs2_sdk/interfaces/cgameresourceserviceserver.h
-    src/core/cs2_sdk/interfaces/cschemasystem.h
     src/core/cs2_sdk/interfaces/cs2_interfaces.h
     src/core/cs2_sdk/interfaces/cs2_interfaces.cpp
     src/core/cs2_sdk/schema.h
@@ -94,66 +98,55 @@ SET(SOURCE_FILES
     src/core/game_system.cpp
 )
 
-
-if (LINUX)
-    # memoverride.cpp is not usable on CMake Windows, cuz CMake default link libraries (seems) always link ucrt.lib
-    set(SOURCE_FILES
-        ${SOURCE_FILES}
-        libraries/hl2sdk-cs2/public/tier0/memoverride.cpp
-    )
-endif()
-
-set(PROTO_DIRS -I${CMAKE_CURRENT_SOURCE_DIR}/libraries/GameTracking-CS2/Protobufs)
-file(GLOB PROTOS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/GameTracking-CS2/Protobufs/*.proto")
+set(PROTO_DIRS -I${CMAKE_CURRENT_SOURCE_DIR}/libraries/Protobufs/csgo)
+file(GLOB PROTOS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/Protobufs/csgo/*.proto")
 
 ## Generate protobuf source & headers
-if (LINUX)
+if(LINUX)
     set(PROTOC_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2/devtools/bin/linux/protoc)
 elseif(WIN32)
     set(PROTOC_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2/devtools/bin/protoc.exe)
 endif()
 
 add_custom_command(
-        OUTPUT protobuf_output_stamp
-        COMMAND ${PROTOC_EXECUTABLE} --proto_path=thirdparty/protobuf-3.21.8/src --proto_path=common --cpp_out=common common/network_connection.proto
-        COMMENT "Generating protobuf file"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2
-        VERBATIM
+    OUTPUT protobuf_output_stamp
+    COMMAND ${PROTOC_EXECUTABLE} --proto_path=thirdparty/protobuf-3.21.8/src --proto_path=common --cpp_out=common common/network_connection.proto
+    COMMENT "Generating protobuf file"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2
+    VERBATIM
 )
 
-SET(SOURCE_FILES ${SOURCE_FILES} protobuf_output_stamp)
+set(SOURCE_FILES ${SOURCE_FILES} protobuf_output_stamp)
 
 # Sources
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${NATIVES_SOURCES} ${CONVERSIONS_SOURCES} ${CONVERSIONS_HEADERS})
 
 target_include_directories(
-        ${PROJECT_NAME}
-        PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cs2_sdk
+    ${PROJECT_NAME}
+    PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cs2_sdk
 )
 
-if (LINUX)
+if(LINUX)
     include("makefiles/linux.base.cmake")
     set_target_properties(${PROJECT_NAME} PROPERTIES
-        PREFIX ""
-        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/addons/counterstrikesharp/bin/linuxsteamrt64"
+                          PREFIX ""
+                          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/addons/counterstrikesharp/bin/linuxsteamrt64"
     )
 elseif(WIN32)
     include("makefiles/windows.base.cmake")
     set_target_properties(${PROJECT_NAME} PROPERTIES
-        PREFIX ""
-        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/addons/counterstrikesharp/bin/win64"
+                          PREFIX ""
+                          LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/addons/counterstrikesharp/bin/win64"
     )
 endif()
 
-
-
 # Libraries
 target_link_libraries(${PROJECT_NAME} ${COUNTER_STRIKE_SHARP_LINK_LIBRARIES})
 
 add_custom_command(
-        TARGET ${PROJECT_NAME} PRE_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${CMAKE_SOURCE_DIR}/configs ${CMAKE_BINARY_DIR}
-)
+    TARGET ${PROJECT_NAME} PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    ${CMAKE_SOURCE_DIR}/configs ${CMAKE_BINARY_DIR}
+)

CONTRIBUTING.md

@@ -0,0 +1,103 @@
+# Contributing to CounterStrikeSharp
+
+We'd love for you to contribute to CS# to make it better than it is today!
+
+Here are the guidelines we'd like you to follow:
+
+ - [Question or Problem?](#question)
+ - [Issues and Bugs](#issue)
+ - [Submission Guidelines](#submit)
+ - [Coding Format](#format)
+
+## <a name="question"></a> Got a Question or Problem?
+
+If you have questions about how to contribute to CounterStrikeSharp, please join our [Discord][discord] server.
+
+## <a name="issue"></a> Found an Issue?
+
+If you find a bug in the source code or a mistake in the documentation, you can help us by
+submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request
+with a fix.
+
+**Please see the [Submission Guidelines](#submit) below.**
+
+## <a name="submit"></a> Submission Guidelines
+
+### Submitting an Issue
+Before you submit your issue please search the archive, maybe your question was already answered.
+
+If your issue appears to be a bug and hasn't been reported, open a new issue. Help us to maximize
+the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
+Providing the following information will increase the chances of your issue being dealt with
+quickly:
+
+* **Overview of the Issue** - if an error is being thrown a stack trace helps
+* **Operating System** - is this a problem with a specific OS (Windows or Linux)?
+* **Reproduce the Error** - provide details, if possible, on how to reproduce the error
+* **Related Issues** - has a similar issue been reported before?
+* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be causing the problem (line of code or commit)
+
+### Submitting a Pull Request
+Before you submit your pull request consider the following guidelines:
+
+* Search [GitHub](https://github.com/roflmuffin/CounterStrikeSharp/pulls) for an open or closed Pull Request
+  that relates to your submission. You don't want to duplicate effort.
+* If adding a feature or enhancement, we recommend you first [start a discussion for
+  it](https://github.com/roflmuffin/CounterStrikeSharp/discussions) before submitting a Pull Request.
+* [Fork](https://help.github.com/articles/fork-a-repo/) this repo.
+* [Clone](https://help.github.com/articles/cloning-a-repository/) your copy.
+    ```shell
+    git clone https://github.com/YOUR_USERNAME/CounterStrikeSharp.git
+    cd CounterStrikeSharp/
+    ```
+* After cloning, set a new remote [upstream](https://help.github.com/articles/configuring-a-remote-for-a-fork/) (this helps to keep your fork up to date)
+    
+    ```shell
+    git remote add upstream https://github.com/roflmuffin/CounterStrikeSharp.git
+    ```
+
+* Make your changes in a new git branch:
+
+    ```shell
+    git checkout -b my-fix-branch master
+    ```
+
+* Create your patch and run appropriate tests.
+* Commit your changes using a descriptive commit message that uses the imperative, present tense: "change" not "changed" nor "changes".
+
+    ```shell
+    git commit -a
+    ```
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+In GitHub, send a pull request to `CounterStrikeSharp:master`.
+If we suggest changes, then:
+
+* Make the required updates.
+* Re-run CounterStrikeSharp to ensure everything is still working & tests are passing.
+* Commit your changes to your branch (e.g. `my-fix-branch`).
+* Push the changes to your GitHub repository (this will update your Pull Request).
+
+If the PR gets too outdated we may ask you to rebase and force push to update the PR:
+
+```shell
+git fetch upstream
+git rebase upstream/master
+git push origin my-fix-branch -f
+```
+
+That's it! Thank you for your contribution!
+
+#### After your pull request is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository.
+
+[github]: https://github.com/roflmuffin/CounterStrikeSharp
+[discord]: https://discord.gg/eAZU3guKWU

README.md

@@ -1,6 +1,6 @@
 # CounterStrikeSharp
 
-CounterStrikeSharp is a server side modding framework for Counter-Strike: Global Offensive. This project attempts to implement a .NET Core scripting layer on top of a Metamod Source Plugin, allowing developers to create plugins that interact with the game server in a modern language (C#) to facilitate the creation of maintainable and testable code.
+CounterStrikeSharp is a server side modding framework for Counter-Strike 2. This project implements a .NET 8 scripting layer on top of a Metamod Source Plugin, allowing developers to create plugins that interact with the game server in a modern language (C#) to facilitate the creation of maintainable and testable code.
 
 [Come and join our Discord](https://discord.gg/eAZU3guKWU)
 
@@ -18,14 +18,12 @@ Detailed installation instructions can be found in the [docs](https://docs.cssha
 
 ## What works?
 
-_(Note, these were features in the previous VSP.NET project, but have not been implemented yet in this project)_
-
 These features are the core of the platform and work pretty well/have a low risk of causing issues.
 
 - [x] Console Commands, Server Commands (e.g. css_mycommand)
 - [x] Chat Commands with `!` and `/` prefixes (e.g. !mycommand)
-- [ ] **(In Progress)** Console Variables
-- [x] Game Event Handlers & Custom Events (e.g. player_death)
+- [x] Fake Console Variables (commands which mimic ConVar behaviour as these have not been fully reverse engineered) 
+- [x] Game Event Handlers & Firing of Events (e.g. player_death)
   - [x] Basic event value get/set (string, bool, int32, float)
   - [x] Complex event values get/set (ehandle, pawn, player controller)
 - [x] Game Tick Based Timers (e.g. repeating map timers)
@@ -34,7 +32,7 @@ These features are the core of the platform and work pretty well/have a low risk
   - [x] Client Listeners (e.g. connect, disconnect, put in server)
   - [x] OnMapStart
   - [x] OnTick
-- [x] Server Information (current map, game time, tick rate, model precaching)
+- [x] Server Information (current map, game time)
 - [x] Schema System Access (access player values like current weapon, money, location etc.)
 
 ## Links

configs/addons/counterstrikesharp/configs/core.example.json

@@ -3,5 +3,6 @@
     "SilentChatTrigger": [ "/" ],
     "FollowCS2ServerGuidelines": true,
     "PluginHotReloadEnabled": true,
+    "PluginAutoLoadEnabled": true,
     "ServerLanguage": "en"
 }

configs/addons/counterstrikesharp/gamedata/gamedata.json

@@ -2,22 +2,22 @@
   "UTIL_ClientPrintAll": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x89\\x5C\\x24\\x08\\x48\\x89\\x6C\\x24\\x10\\x48\\x89\\x74\\x24\\x18\\x57\\x48\\x81\\xEC\\x70\\x01\\x2A\\x2A\\x8B\\xE9",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x49\\x89\\xD7\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x41\\x89\\xFD"
+      "windows": "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 81 EC 70 01 ? ? 8B E9",
+      "linux": "55 48 89 E5 41 57 49 89 D7 41 56 49 89 F6 41 55 41 89 FD"
     }
   },
   "ClientPrint": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x85\\xC9\\x0F\\x84\\x2A\\x2A\\x2A\\x2A\\x48\\x8B\\xC4\\x48\\x89\\x58\\x18",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x49\\x89\\xCF\\x41\\x56\\x49\\x89\\xD6\\x41\\x55\\x41\\x89\\xF5\\x41\\x54\\x4C\\x8D\\xA5\\xA0\\xFE\\xFF\\xFF"
+      "windows": "48 85 C9 0F 84 ? ? ? ? 48 8B C4 48 89 58 18",
+      "linux": "55 48 89 E5 41 57 49 89 CF 41 56 49 89 D6 41 55 41 89 F5 41 54 4C 8D A5 A0 FE FF FF"
     }
   },
   "CCSPlayerController_SwitchTeam": {
     "signatures": {
       "library": "server",
-      "windows": "\\x40\\x56\\x57\\x48\\x81\\xEC\\x2A\\x2A\\x2A\\x2A\\x48\\x8B\\xF9\\x8B\\xF2\\x8B\\xCA",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x55\\x49\\x89\\xFD\\x89\\xF7"
+      "windows": "40 56 57 48 81 EC ? ? ? ? 48 8B F9 8B F2 8B CA",
+      "linux": "55 48 89 E5 41 55 49 89 FD 89 F7"
     }
   },
   "CCSPlayerController_ChangeTeam": {
@@ -28,110 +28,123 @@
   },
   "CCSPlayerController_Respawn": {
     "offsets": {
-        "windows": 244,
-        "linux": 246
+      "windows": 244,
+      "linux": 246
     }
   },
   "CBasePlayerController_SetPawn": {
     "signatures": {
       "library": "server",
-      "windows": "\\x44\\x88\\x4C\\x24\\x20\\x55\\x57\\x41\\x54\\x41\\x56\\x41\\x57\\x48\\x8D\\x6C\\x24\\x2A\\x48\\x81\\xEC\\x2A",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x49\\x89\\xFC\\x53\\x48\\x89\\xF3\\x48\\x81\\xEC\\xC8\\x00\\x00\\x00"
+      "windows": "44 88 4C 24 20 55 57 41 54 41 56 41 57 48 8D 6C 24 ? 48 81 EC ?",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 89 F3 48 81 EC C8 00 00 00"
     }
   },
   "CCSPlayerPawnBase_PostThink": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x8B\\xC4\\x48\\x89\\x48\\x08\\x55\\x53\\x56\\x57\\x41\\x56\\x48\\x8D\\xA8\\xD8\\xFE\\xFF\\xFF",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x53\\x48\\x89\\xFB\\x48\\x81\\xEC\\x2A\\x2A\\x2A\\x2A\\xE8\\x2A\\x2A\\x2A\\x2A\\x48\\x89\\xDF"
+      "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 30 E8 ? ? ? ?"
     }
   },
   "GiveNamedItem": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x89\\x5C\\x24\\x18\\x48\\x89\\x74\\x24\\x20\\x55\\x57\\x41\\x54\\x41\\x56\\x41\\x57\\x48\\x8D\\x6C\\x24\\xD9",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x49\\x89\\xCE\\x41\\x55\\x49\\x89\\xF5\\x41\\x54\\x49\\x89\\xD4"
+      "windows": "48 89 5C 24 ? 48 89 74 24 ? 55 57 41 ? 41 ? 41 ? 48 ? ? ? ? 48 ? ? ? ? ? ? 4D ? ? 48",
+      "linux": "55 48 89 E5 41 57 41 56 49 89 D6 41 55 49 89 FD 41 54 48"
     }
   },
   "UTIL_Remove": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x85\\xC9\\x74\\x2A\\x48\\x8B\\xD1\\x48\\x8B\\x0D\\x2A\\x2A\\x2A\\x2A",
-      "linux": "\\x48\\x89\\xFE\\x48\\x85\\xFF\\x74\\x2A\\x48\\x8D\\x05\\x2A\\x2A\\x2A\\x2A\\x48"
+      "windows": "48 85 C9 74 ? 48 8B D1 48 8B 0D ? ? ? ?",
+      "linux": "48 89 FE 48 85 FF 74 ? 48 8D 05 ? ? ? ? 48"
     }
   },
   "Host_Say": {
     "signatures": {
       "library": "server",
-      "windows": "\\x44\\x89\\x4C\\x24\\x20\\x44\\x88\\x44\\x24\\x18",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x49\\x89\\xFF\\x41\\x56\\x41\\x55\\x41\\x54\\x4D\\x89\\xC4"
+      "windows": "44 89 4C 24 20 44 88 44 24 18",
+      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 41 55 41 54 4D 89 C4"
     }
   },
   "CBaseModelEntity_SetModel": {
     "signatures": {
-        "library": "server",
-        "windows": "\\x48\\x89\\x5C\\x24\\x2A\\x48\\x89\\x7C\\x24\\x2A\\x55\\x48\\x8B\\xEC\\x48\\x83\\xEC\\x50\\x48\\x8B\\xF9\\x4C\\x8B\\xC2",
-        "linux": "\\x55\\x48\\x89\\xF2\\x48\\x89\\xE5\\x41\\x54\\x49\\x89\\xFC\\x48\\x8D\\x7D\\xE0\\x48\\x83\\xEC\\x2A\\x48\\x8D\\x05\\x2A\\x2A\\x2A\\x2A\\x48\\x8B\\x30\\x48\\x8B\\x06"
+      "library": "server",
+      "windows": "48 89 5C 24 ? 48 89 7C 24 ? 55 48 8B EC 48 83 EC 50 48 8B F9 4C 8B C2",
+      "linux": "55 48 89 F2 48 89 E5 41 54 49 89 FC 48 8D 7D E0 48 83 EC ? 48 8D 05 ? ? ? ? 48 8B 30 48 8B 06"
     }
   },
   "CCSPlayer_WeaponServices_CanUse": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x89\\x5C\\x24\\x10\\x48\\x89\\x6C\\x24\\x18\\x56\\x57\\x41\\x56\\x48\\x83\\xEC\\x30\\x80\\xB9\\xA0\\x00\\x00\\x00\\x00",
-      "linux": "\\x48\\x85\\xF6\\x0F\\x84\\x2A\\x2A\\x2A\\x2A\\x55\\x31\\xC9\\x48\\x89\\xE5\\x41\\x55\\x49\\x89\\xFD"
+      "windows": "48 89 5C 24 10 48 89 6C 24 18 56 57 41 56 48 83 EC 30 80 B9 A0 00 00 00 00",
+      "linux": "48 85 F6 0F 84 ? ? ? ? 55 31 C9 48 89 E5 41 55 49 89 FD"
+    }
+  },
+  "CCSPlayer_ItemServices_GiveNamedItem": {
+    "offsets": {
+      "windows": 17,
+      "linux": 18
     }
   },
   "CCSPlayer_ItemServices_DropActivePlayerWeapon": {
     "offsets": {
-        "windows": 18,
-        "linux": 19
+      "windows": 18,
+      "linux": 19
     }
   },
   "CCSPlayer_ItemServices_RemoveWeapons": {
-      "offsets": {
-          "windows": 19,
-          "linux": 20
-      }
+    "offsets": {
+      "windows": 19,
+      "linux": 20
+    }
   },
   "CGameSceneNode_GetSkeletonInstance": {
     "offsets": {
-        "windows": 8,
-        "linux": 8
+      "windows": 8,
+      "linux": 8
     }
   },
   "CCSGameRules_TerminateRound": {
     "signatures": {
-        "library": "server",
-        "windows": "\\x48\\x8B\\xC4\\x4C\\x89\\x48\\x20\\x55\\x57",
-        "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x49\\x89\\xFC\\x53\\x48\\x81\\xEC\\xE8\\x01\\x00\\x00\\x48\\x8D\\x05\\x2A\\x2A\\x2A\\x2A"
-      }
+      "library": "server",
+      "windows": "48 ? ? 4C 89 48 ? 48 89 48 ? 55 41",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 81 EC E8 01 00 00 48 8D 05 ? ? ? ?"
+    }
   },
   "UTIL_CreateEntityByName": {
     "signatures": {
-        "library": "server",
-        "windows": "\\x48\\x83\\xEC\\x48\\xC6\\x44\\x24\\x30\\x00",
-        "linux": "\\x48\\x8D\\x05\\x2A\\x2A\\x2A\\x2A\\x55\\x48\\x89\\xFA"
-      }
+      "library": "server",
+      "windows": "48 83 EC 48 C6 44 24 30 00",
+      "linux": "48 8D 05 ? ? ? ? 55 48 89 FA"
+    }
   },
   "CBaseEntity_DispatchSpawn": {
     "signatures": {
-        "library": "server",
-        "windows": "\\x48\\x89\\x5C\\x24\\x10\\x57\\x48\\x83\\xEC\\x30\\x48\\x8B\\xDA\\x48\\x8B\\xF9\\x48\\x85\\xC9",
-        "linux": "\\x48\\x85\\xFF\\x74\\x2A\\x55\\x48\\x89\\xE5\\x41\\x56"
-      }
+      "library": "server",
+      "windows": "48 89 5C 24 10 57 48 83 EC 30 48 8B DA 48 8B F9 48 85 C9",
+      "linux": "48 85 FF 74 ? 55 48 89 E5 41 56"
+    }
   },
   "CEntityInstance_AcceptInput": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x89\\x5C\\x24\\x10\\x48\\x89\\x74\\x24\\x18\\x57\\x48\\x83\\xEC\\x40\\x49\\x8B\\xF0",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x49\\x89\\xFF\\x41\\x56\\x48\\x8D\\x7D\\xC0"
+      "windows": "48 89 5C 24 10 48 89 74 24 18 57 48 83 EC 40 49 8B F0",
+      "linux": "55 48 89 E5 41 57 49 89 FF 41 56 48 8D 7D C0"
+    }
+  },
+  "CEntitySystem_AddEntityIOEvent": {
+    "signatures": {
+      "library": "server",
+      "windows": "48 89 5C 24 ? 48 89 74 24 ? 57 48 ? ? ? 49 ? ? 48 ? ? 48 ? ? 74",
+      "linux": "55 41 BA FF FF FF FF"
     }
   },
   "LegacyGameEventListener": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x8B\\x15\\x2A\\x2A\\x2A\\x2A\\x48\\x85\\xD2\\x74\\x2A\\x85\\xC9\\x74",
-      "linux": "\\x48\\x8B\\x05\\x2A\\x2A\\x2A\\x2A\\x48\\x85\\xC0\\x74\\x2A\\x83\\xFF\\x3F\\x76\\x2A\\x31\\xC0"
+      "windows": "48 8B 15 ? ? ? ? 48 85 D2 74 ? 85 C9 74",
+      "linux": "48 8B 05 ? ? ? ? 48 85 C0 74 ? 83 FF 3F 76 ? 31 C0"
     }
   },
   "CBasePlayerPawn_CommitSuicide": {
@@ -143,8 +156,8 @@
   "CBasePlayerPawn_RemovePlayerItem": {
     "signatures": {
       "library": "server",
-      "linux": "\\x55\\x48\\x89\\x2A\\x41\\x2A\\x49\\x89\\x2A\\x41\\x2A\\x49\\x89\\x2A\\xE8\\x2A\\x2A\\x2A\\x2A\\x49\\x39",
-      "windows": "\\x48\\x85\\xD2\\x0F\\x84\\x2A\\x2A\\x2A\\x2A\\x48\\x89\\x5C\\x24\\x08\\x57\\x48\\x83\\xEC\\x30\\x48\\x8B\\xDA"
+      "windows": "48 ? ? 0F 84 ? ? ? ? 48 89 5C 24 ? 57 48 ? ? ? 48 ? ? 48 ? ? E8",
+      "linux": "55 48 89 ? 41 ? 49 89 ? 41 ? 49 89 ? E8 ? ? ? ? 49 39"
     }
   },
   "CBaseEntity_Teleport": {
@@ -156,36 +169,36 @@
   "CBaseEntity_TakeDamageOld": {
     "signatures": {
       "library": "server",
-      "windows": "\\x40\\x56\\x57\\x48\\x83\\xEC\\x58\\x48\\x8B\\x41\\x10",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x49\\x89\\xFC\\x53\\x48\\x83\\xEC\\x38\\x4C\\x8D\\x2D\\x2A\\x2A\\x2A\\x2A\\x49\\x8B\\x7D\\x00\\x48\\x85\\xFF\\x0F\\x84\\x2A\\x2A\\x2A\\x2A"
+      "windows": "40 56 57 48 83 EC 58 48 8B 41 10",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 83 EC 38 4C 8D 2D ? ? ? ? 49 8B 7D 00 48 85 FF 0F 84 ? ? ? ?"
     }
   },
   "CBaseTrigger_StartTouch": {
     "signatures": {
       "library": "server",
-      "windows": "\\x41\\x56\\x41\\x57\\x48\\x83\\xEC\\x58\\x48\\x8B\\x01",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x49\\x89\\xFD\\x41\\x54\\x53\\xBB"
+      "windows": "41 56 41 57 48 83 EC 58 48 8B 01",
+      "linux": "55 48 89 E5 41 56 49 89 F6 41 55 49 89 FD 41 54 53 BB"
     }
   },
   "CBaseTrigger_EndTouch": {
     "signatures": {
       "library": "server",
-      "windows": "\\x40\\x53\\x57\\x41\\x55\\x48\\x83\\xEC\\x40",
-      "linux": "\\x55\\xBA\\xFF\\xFF\\xFF\\xFF\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x49\\x89\\xF5\\x41"
+      "windows": "40 53 57 41 55 48 83 EC 40",
+      "linux": "55 BA FF FF FF FF 48 89 E5 41 57 41 56 41 55 49 89 F5 41"
     }
   },
   "StateChanged": {
     "signatures": {
       "library": "server",
-      "windows": "\\x40\\x55\\x53\\x56\\x41\\x55\\x41\\x57\\x48\\x8D\\x6C\\x24\\xB0",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x53\\x89\\xD3"
+      "windows": "40 55 53 56 41 55 41 57 48 8D 6C 24 B0",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 53 89 D3"
     }
   },
   "NetworkStateChanged": {
     "signatures": {
       "library": "server",
-      "windows": "\\x4C\\x8B\\xC9\\x48\\x8B\\x09\\x48\\x85\\xC9\\x74\\x2A\\x48\\x8B\\x41\\x10",
-      "linux": "\\x4C\\x8B\\x07\\x4D\\x85\\xC0\\x74\\x2A\\x49\\x8B\\x40\\x10"
+      "windows": "4C 8B C9 48 8B 09 48 85 C9 74 ? 48 8B 41 10",
+      "linux": "4C 8B 07 4D 85 C0 74 ? 49 8B 40 10"
     }
   },
   "GameEntitySystem": {
@@ -203,15 +216,15 @@
   "CEntityIOOutput_FireOutputInternal": {
     "signatures": {
       "library": "server",
-      "windows": "\\x4C\\x89\\x4C\\x24\\x20\\x53\\x55\\x57\\x41\\x54\\x41\\x56\\x48\\x81\\xEC",
-      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x41\\x55\\x41\\x54\\x49\\x89\\xD4\\x53\\x48\\x89\\xF3\\x48\\x83\\xEC\\x58"
+      "windows": "4C 89 4C 24 20 53 55 57 41 54 41 56 48 81 EC",
+      "linux": "55 48 89 E5 41 57 41 56 41 55 41 54 49 89 D4 53 48 89 F3 48 83 EC 58"
     }
   },
   "IGameSystem_InitAllSystems_pFirst": {
     "signatures": {
       "library": "server",
-      "windows": "\\x48\\x8B\\x1D\\x2A\\x2A\\x2A\\x2A\\x48\\x85\\xDB\\x0F\\x84\\x2A\\x2A\\x2A\\x2A\\xBE\\x2A\\x2A\\x2A\\x2A\\x0F\\x1F\\x00\\x48\\x8B\\x7B\\x10",
-      "linux": "\\x4C\\x8B\\x35\\x2A\\x2A\\x2A\\x2A\\x4D\\x85\\xF6\\x75\\x2D\\xE9\\x2A\\x2A\\x2A\\x2A\\x0F\\x1F\\x40\\x00\\x48\\x8B\\x05"
+      "windows": "48 8B 1D ? ? ? ? 48 85 DB 0F 84 ? ? ? ? BE ? ? ? ? 0F 1F 00 48 8B 7B 10",
+      "linux": "4C 8B 35 ? ? ? ? 4D 85 F6 75 2D E9 ? ? ? ? 0F 1F 40 00 48 8B 05"
     }
   },
   "CEntityResourceManifest_AddResource": {

docfx/docs/guides/hello-world-plugin.md

@@ -9,7 +9,7 @@ How to write your first plugin for CounterStrikeSharp
 
 ## Creating a New Project
 
-First, ensure you have the relevant .NET 7.0 SDK for your platform installed on your machine. You can find the links to the latest downloads on the <a href="https://dotnet.microsoft.com/en-us/download/dotnet/7.0" target="_blank"> official Microsoft download page</a>.
+First, ensure you have the relevant .NET 8.0 SDK for your platform installed on your machine. You can find the links to the latest downloads on the <a href="https://dotnet.microsoft.com/en-us/download/dotnet/8.0" target="_blank"> official Microsoft download page</a>.
 
 ### Creating a Class Library
 
@@ -25,7 +25,7 @@ Use your IDE (Visual Studio/Rider) to add a reference to the `CounterStrikeSharp
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -65,7 +65,7 @@ public class HelloWorldPlugin : BasePlugin
 }
 ```
 
-Now build your project using your ide or the `dotnet build` command. You should now have a built binary file in your `bin/Debug/net7.0` subdirectory in the project.
+Now build your project using your ide or the `dotnet build` command. You should now have a built binary file in your `bin/Debug/net8.0` subdirectory in the project.
 
 ### Installing your Plugin
 

docfx/docs/reference/core-configuration.md

@@ -33,6 +33,10 @@ receive a ban.
 
 When enabled, plugins are automatically reloaded when their .dll file is updated.
 
+## PluginAutoLoadEnabled
+
+When enabled, plugins are automatically loaded from the plugins directory on server start.
+
 ## ServerLanguage
 
 Configures the default language to use for server commands & messages. The format for the culture name based on RFC 4646 is `languagecode2-country`/`regioncode2`, where `languagecode2` is the two-letter language code and `country/regioncode2` is the two-letter subculture code. Examples include `ja-JP` for Japanese (Japan) and `en-US` for English (United States). Defaults to "en".

eng/formatting/download-tools.ps1

@@ -0,0 +1,37 @@
+# Tool taken from dotnet/runtime
+# https://github.com/dotnet/runtime/blob/a8158c170b694f8c1dbae114c63c346b38244901/eng/formatting/download-tools.ps1
+
+function DownloadClangTool {
+    param (
+        [string]
+        $toolName,
+        [string]
+        $downloadOutputPath
+    )
+
+    $clangVersion = "17.0.6"
+    $clangToolsRootUrl = "https://clrjit2.blob.core.windows.net/clang-tools"
+    $clangPlatform = "windows-x64"
+
+    $toolUrl = "$clangToolsRootUrl/$clangVersion/$clangPlatform/$toolName.exe"
+    $targetPath = "$downloadOutputPath\$toolName.exe" 
+
+    if (-not $(ls $downloadOutputPath | Where-Object { $_.Name -eq "$toolName.exe" })) {
+        Write-Output "Downloading '$toolUrl' to '$targetPath'"
+        # Pass -PassThru as otherwise Invoke-WebRequest leaves a corrupted file if the download fails. With -PassThru the download is buffered first.
+        # -UseBasicParsing is necessary for older PowerShells when Internet Explorer might not be installed/configured
+        $null = Invoke-WebRequest -Uri "$toolUrl" -OutFile $(Join-Path $downloadOutputPath -ChildPath "$toolName.exe") -PassThru -UseBasicParsing
+    }
+    else {
+        Write-Output "Found '$targetPath'"
+    }
+}
+
+$downloadPathFolder = Split-Path $PSScriptRoot -Parent | Split-Path -Parent | Join-Path -ChildPath "artifacts" | Join-Path -ChildPath "tools"
+
+mkdir $downloadPathFolder -ErrorAction SilentlyContinue
+
+DownloadClangTool "clang-format" "$downloadPathFolder"
+
+# Add to path to enable scripts to skip additional downloading steps since the tools will already be on the path.
+$env:PATH = "$downloadPathFolder;$env:PATH"

eng/formatting/download-tools.sh

@@ -0,0 +1,60 @@
+# Tool taken from dotnet/runtime
+# https://github.com/dotnet/runtime/blob/a8158c170b694f8c1dbae114c63c346b38244901/eng/formatting/download-tools.sh
+
+#!/usr/bin/env bash
+
+set -ue
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $source until the file is no longer a symlink
+while [[ -h "$source" ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+function DownloadClangTool {
+
+    clangVersion="17.0.6"
+    clangToolsRootUrl="https://clrjit2.blob.core.windows.net/clang-tools"
+
+    clangPlatform="$(dotnet --info | grep 'RID:')"
+    clangPlatform="${clangPlatform##*RID:* }"
+    echo "dotnet RID: ${clangPlatform}"
+
+    # override common RIDs with compatible version so we don't need to upload binaries for each RID
+    case $clangPlatform in
+        ubuntu.*-x64)
+        clangPlatform=linux-x64
+        ;;
+    esac
+
+    toolUrl="${clangToolsRootUrl}/${clangVersion}/${clangPlatform}/$1"
+    toolOutput=$2/$1
+
+    echo "Downloading $1 from ${toolUrl} to ${toolOutput}"
+
+    if [[ ! -x "$toolOutput" ]]; then
+        curl --silent --retry 5 --fail -o "${toolOutput}" "$toolUrl"
+        chmod 751 $toolOutput
+    fi
+
+    if [[ ! -x "$toolOutput" ]]; then
+        echo "Failed to download $1"
+        exit 1
+    fi
+}
+
+
+engFolder="$(cd -P "$( dirname "$scriptroot" )" && pwd )"
+downloadPathFolder="$(cd -P "$( dirname "$engFolder" )" && pwd )/artifacts/tools"
+
+mkdir -p "$downloadPathFolder"
+
+DownloadClangTool "clang-format" "$downloadPathFolder"
+
+export PATH=$downloadPathFolder:$PATH

eng/formatting/format.sh

@@ -0,0 +1,29 @@
+# Tool taken from dotnet/runtime
+# https://github.com/dotnet/runtime/blob/a8158c170b694f8c1dbae114c63c346b38244901/eng/formatting/format.sh
+
+#!/bin/sh
+
+LC_ALL=C
+# Select files to format
+NATIVE_FILES=$(git diff --cached --name-only --diff-filter=ACM "*.h" "*.hpp" "*.c" "*.cpp" "*.inl" | sed 's| |\\ |g')
+MANAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM "*.cs" "*.vb" | sed 's| |\\ |g')
+
+exec 1>&2
+
+if [ -n "$NATIVE_FILES" ]; then
+    # Format all selected files
+    echo "$NATIVE_FILES" | cat | xargs | sed -e 's/ /,/g' | xargs "./artifacts/tools/clang-format" -style=file -i
+
+    # Add back the modified files to staging
+    echo "$NATIVE_FILES" | xargs git add
+fi
+
+if [ -n "$MANAGED_FILES" ]; then
+    # Format all selected files
+    echo "$MANAGED_FILES" | cat | xargs | sed -e 's/ /,/g' | dotnet format whitespace --include - --folder
+
+    # Add back the modified files to staging
+    echo "$MANAGED_FILES" | xargs git add
+fi
+
+exit 0

eng/install/install.ps1

@@ -0,0 +1,71 @@
+# Install script that downloads Metamod:Source and Counter-Strike Sharp (with runtime)
+
+$MM_DOWNLOAD_URL = "https://mms.alliedmods.net/mmsdrop/2.0/mmsource-2.0.0-git1286-windows.zip"
+$TARGET_DIR = "./game/csgo"
+$GAMEINFO_FILE = Join-Path $TARGET_DIR "gameinfo.gi"
+$ProgressPreference = 'SilentlyContinue'
+
+# Verification
+if (-not (Test-Path $GAMEINFO_FILE)) {
+    Write-Error "Error: $GAMEINFO_FILE does not exist in the specified directory."
+    exit 1
+}
+
+# GitHub API for Counter-Strike Sharp Releases
+$RELEASE_INFO = (Invoke-WebRequest -Uri "https://api.github.com/repos/roflmuffin/CounterStrikeSharp/releases/latest").Content | ConvertFrom-Json
+
+# Filtering download URLs
+$CSSHARP_DOWNLOAD_URL = $RELEASE_INFO.assets | 
+    Where-Object { $_.browser_download_url -like '*windows*.zip*' -and $_.browser_download_url -notlike '*with-runtime*' } | 
+    Select-Object -First 1 -ExpandProperty browser_download_url
+
+$CSSHARP_RUNTIME_DOWNLOAD_URL = $RELEASE_INFO.assets | 
+    Where-Object { $_.browser_download_url -like '*windows*.zip*' -and $_.browser_download_url -like '*with-runtime*' } | 
+    Select-Object -First 1 -ExpandProperty browser_download_url
+
+### METAMOD:SOURCE ###
+Write-Output "Downloading Metamod:Source..."
+
+Invoke-WebRequest -Uri $MM_DOWNLOAD_URL -OutFile metamod.zip
+Write-Output "Extracting Metamod:Source to $TARGET_DIR..."
+Expand-Archive -Force -Path metamod.zip -DestinationPath $TARGET_DIR
+Remove-Item metamod.zip 
+
+### GAMEINFO.GI UPDATE ###
+$NEW_ENTRY = "			Game    csgo/addons/metamod"
+$FILE_CONTENT = Get-Content $GAMEINFO_FILE
+
+Write-Output "Updating $GAMEINFO_FILE..."
+if ($FILE_CONTENT -contains $NEW_ENTRY) {
+    Write-Output "The entry '$NEW_ENTRY' already exists in $GAMEINFO_FILE. No changes were made."
+} else {
+    $Pattern = "Game_LowViolence"
+    $Modified = $false
+    $NewContent = @()
+
+    foreach ($line in $FILE_CONTENT) {
+        if ($line -match $Pattern -and -not $Modified) {
+            $NewContent += $line
+            $NewContent += $NEW_ENTRY
+            $Modified = $true
+        } else {
+            $NewContent += $line
+        }
+    }
+
+    $NewContent | Set-Content $GAMEINFO_FILE
+    Write-Host "The file $GAMEINFO_FILE has been modified successfully. '$NEW_ENTRY' has been added."
+}
+
+### COUNTER-STRIKE SHARP ###
+Write-Output "Downloading Counter-Strike Sharp (with runtime)..."
+
+# Determine if runtime needs to be downloaded
+if (-not (Test-Path "./game/csgo/addons/CounterStrikeSharp/dotnet/dotnet.exe")) {
+    $CSSHARP_DOWNLOAD_URL = $CSSHARP_RUNTIME_DOWNLOAD_URL
+}
+
+Invoke-WebRequest -Uri $CSSHARP_DOWNLOAD_URL -OutFile cssharp.zip
+Write-Output "Extracting Counter-Strike Sharp to $TARGET_DIR..."
+Expand-Archive -Force -Path cssharp.zip -DestinationPath $TARGET_DIR
+Remove-Item cssharp.zip 

eng/install/install.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Install script that downloads Metamod:Source and Counter-Strike Sharp (with runtime)
+
+MM_DOWNLOAD_URL="https://mms.alliedmods.net/mmsdrop/2.0/mmsource-2.0.0-git1286-linux.tar.gz"
+TARGET_DIR="./game/csgo"
+GAMEINFO_FILE="${TARGET_DIR}/gameinfo.gi"
+
+if [ ! -f "${GAMEINFO_FILE}" ]; then
+    printf "Error: %s does not exist in the specified directory.\n" "$GAMEINFO_FILE"
+    exit 1
+fi
+
+RELEASE_INFO=$(curl -s https://api.github.com/repos/roflmuffin/CounterStrikeSharp/releases/latest)
+
+# Filter and store download URLs
+CSSHARP_DOWNLOAD_URL=$(echo "$RELEASE_INFO" | grep -o "browser_download_url.*linux.*\.zip" | cut -d '"' -f 3 | grep -v "with-runtime")
+CSSHARP_RUNTIME_DOWNLOAD_URL=$(echo "$RELEASE_INFO" | grep -o "browser_download_url.*linux.*\.zip" | cut -d '"' -f 3 | grep "with-runtime")
+
+### METAMOD:SOURCE ###
+printf "Downloading Metamod:Source...\n"
+
+curl -s -L -o metamod.tar.gz "$MM_DOWNLOAD_URL"
+
+if [ $? -eq 0 ]; then
+    printf "Extracting Metamod:Source to %s...\n" "$TARGET_DIR"
+    tar -xzf metamod.tar.gz -C "$TARGET_DIR"
+
+    rm metamod.tar.gz
+else
+    echo "Download failed. Please check the URL and your connection."
+fi
+
+### GAMEINFO.GI UPDATE ###
+NEW_ENTRY="			Game    csgo/addons/metamod"
+
+printf "Updating %s...\n" "$GAMEINFO_FILE"
+if grep -Fxq "$NEW_ENTRY" "$GAMEINFO_FILE"; then
+    echo "The entry '$(echo $NEW_ENTRY | xargs)' already exists in ${GAMEINFO_FILE}. No changes were made."
+else
+    awk -v new_entry="$NEW_ENTRY" '
+        BEGIN { found=0; }
+        // {
+            if (found) {
+                print new_entry;
+                found=0;
+            }
+            print;
+        }
+        /Game_LowViolence/ { found=1; }
+    ' "$GAMEINFO_FILE" > "$GAMEINFO_FILE.tmp" && mv "$GAMEINFO_FILE.tmp" "$GAMEINFO_FILE"
+
+    printf "The file %s has been modified successfully. '%s' has been added.\n" "$GAMEINFO_FILE" "$(echo $NEW_ENTRY | xargs)"
+fi
+
+printf "Downloading Counter-Strike Sharp (with runtime)...\n"
+
+# If ./game/csgo/addons/CounterStrikeSharp/dotnet/dotnet does not exist, use the runtime download url
+if [ ! -f "./game/csgo/addons/CounterStrikeSharp/dotnet/dotnet" ]; then
+    CSSHARP_DOWNLOAD_URL="$CSSHARP_RUNTIME_DOWNLOAD_URL"
+fi
+
+curl -s -L -o cssharp.zip "$CSSHARP_DOWNLOAD_URL"
+
+if [ $? -eq 0 ]; then
+    printf "Extracting Counter-Strike Sharp to %s...\n" "$TARGET_DIR"
+    unzip -q -o cssharp.zip -d "$TARGET_DIR"
+
+    rm cssharp.zip
+else
+    echo "Download failed. Please check the URL and your connection."
+fi

examples/HelloWorld/HelloWorld.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/MySharedTypes.Contracts/MySharedTypes.Contracts/MySharedTypes.Contracts.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

examples/WarcraftPlugin/WarcraftPlugin.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

examples/WithCommands/WithCommands.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithConfig/WithConfig.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithDatabaseDapper/WithDatabaseDapper.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithDependencyInjection/WithDependencyInjection.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithEntityOutputHooks/WithEntityOutputHooks.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithFakeConvars/WithFakeConvars.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithGameEventHandlers/WithGameEventHandlers.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithSharedTypes/WithSharedTypes.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithSharedTypes/WithSharedTypesPlugin.cs

@@ -5,7 +5,7 @@ using MySharedTypes.Contracts;
 
 namespace WithSharedTypes;
 
-[MinimumApiVersion(143)]
+[MinimumApiVersion(184)]
 public class WithSharedTypesPlugin : BasePlugin
 {
     public override string ModuleName => "Example: Shared Types";
@@ -54,4 +54,4 @@ public class WithSharedTypesPlugin : BasePlugin
     public override void Unload(bool hotReload)
     {
     }
-}
+}

examples/WithSharedTypesConsumer/WithSharedTypesConsumer.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithSharedTypesConsumer/WithSharedTypesConsumerPlugin.cs

@@ -6,7 +6,7 @@ using MySharedTypes.Contracts;
 
 namespace WithSharedTypesConsumer;
 
-[MinimumApiVersion(142)]
+[MinimumApiVersion(184)]
 public class WithSharedTypesConsumerPlugin : BasePlugin
 {
     public override string ModuleName => "Example: Shared Types (Consumer)";
@@ -53,4 +53,4 @@ public class WithSharedTypesConsumerPlugin : BasePlugin
     public override void Unload(bool hotReload)
     {
     }
-}
+}

examples/WithTranslations/WithTranslations.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

examples/WithVoiceOverrides/WithVoiceOverrides.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

makefiles/shared.cmake

@@ -11,8 +11,7 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING
     FORCE
 )
 
-# TODO: Use C++20 instead.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if (LINUX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -29,6 +28,18 @@ set(SOURCESDK_LIB ${SOURCESDK}/lib)
 
 add_definitions(-DMETA_IS_SOURCE2)
 
+if(DEFINED ENV{GITHUB_SHA_SHORT})
+    add_definitions(-DGITHUB_SHA="$ENV{GITHUB_SHA_SHORT}")
+else()
+    add_definitions(-DGITHUB_SHA="Local")
+endif()
+
+if(DEFINED ENV{BUILD_NUMBER})
+    add_definitions(-DBUILD_NUMBER="$ENV{BUILD_NUMBER}")
+else()
+    add_definitions(-DBUILD_NUMBER="0")
+endif()
+
 include_directories(
     ${SOURCESDK}
     ${SOURCESDK}/thirdparty/protobuf-3.21.8/src
@@ -43,6 +54,7 @@ include_directories(
     ${SOURCESDK}/public/entity2
     ${SOURCESDK}/public/game/server
     ${SOURCESDK}/public/entity2
+    ${SOURCESDK}/public/schemasystem
     ${METAMOD_DIR}/core
     ${METAMOD_DIR}/core/sourcehook
     libraries/dyncall/dynload
@@ -51,6 +63,7 @@ include_directories(
     libraries/tl
     libraries/funchook/include
     libraries/DynoHook/src
+    libraries/moodycamel
     libraries
 )
 

makefiles/windows.base.cmake

@@ -6,6 +6,7 @@ add_definitions(
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4819 /wd4828 /wd5033 /permissive- /utf-8 /wd4005 /MP")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
+set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt")
 
 set(COUNTER_STRIKE_SHARP_LINK_LIBRARIES
     ${SOURCESDK_LIB}/public/win64/tier0.lib
@@ -18,4 +19,4 @@ set(COUNTER_STRIKE_SHARP_LINK_LIBRARIES
     distorm
     funchook-static
     dynohook
-)
+)

managed/CounterStrikeSharp.API.Tests/CounterStrikeSharp.API.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

managed/CounterStrikeSharp.API/Api.cs

@@ -13,4 +13,14 @@ public class Api
     {
         return Assembly.GetAssembly(typeof(BasePlugin))!.GetName().Version!.Build;
     }
+    
+    /// <summary>
+    /// Returns the assembly version of CounterStrikeSharp running on the server as a string including git commit hash
+    /// </summary>
+    /// <example>1.0.0+9d8b6be</example>
+    public static string GetVersionString()
+    {
+        return Assembly.GetAssembly(typeof(BasePlugin))!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!
+            .InformationalVersion;
+    }
 }

managed/CounterStrikeSharp.API/Core/API.cs

@@ -315,16 +315,6 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
-        public static float GetGameFrameTime(){
-			lock (ScriptContext.GlobalScriptContext.Lock) {
-			ScriptContext.GlobalScriptContext.Reset();
-			ScriptContext.GlobalScriptContext.SetIdentifier(0x97E331CA);
-			ScriptContext.GlobalScriptContext.Invoke();
-			ScriptContext.GlobalScriptContext.CheckErrors();
-			return (float)ScriptContext.GlobalScriptContext.GetResult(typeof(float));
-			}
-		}
-
         public static double GetEngineTime(){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();
@@ -512,6 +502,17 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
+        public static void QueueTaskForFrame(int tick, InputArgument callback){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.Push(tick);
+			ScriptContext.GlobalScriptContext.Push((InputArgument)callback);
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x2F92C340);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			}
+		}
+
         public static void QueueTaskForNextWorldUpdate(InputArgument callback){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();
@@ -713,6 +714,37 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
+        public static void AcceptInput(IntPtr pthis, string inputname, IntPtr activator, IntPtr caller, string value, int outputid){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.Push(pthis);
+			ScriptContext.GlobalScriptContext.Push(inputname);
+			ScriptContext.GlobalScriptContext.Push(activator);
+			ScriptContext.GlobalScriptContext.Push(caller);
+			ScriptContext.GlobalScriptContext.Push(value);
+			ScriptContext.GlobalScriptContext.Push(outputid);
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x259E084C);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			}
+		}
+
+        public static void AddEntityIoEvent(IntPtr ptarget, string inputname, IntPtr activator, IntPtr caller, string value, float delay, int outputid){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.Push(ptarget);
+			ScriptContext.GlobalScriptContext.Push(inputname);
+			ScriptContext.GlobalScriptContext.Push(activator);
+			ScriptContext.GlobalScriptContext.Push(caller);
+			ScriptContext.GlobalScriptContext.Push(value);
+			ScriptContext.GlobalScriptContext.Push(delay);
+			ScriptContext.GlobalScriptContext.Push(outputid);
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x4CFDE98A);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			}
+		}
+
         public static void HookEvent(string name, InputArgument callback, bool ispost){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();
@@ -749,6 +781,16 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
+        public static void FreeEvent(IntPtr gameevent){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.Push(gameevent);
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x7E8B60C2);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			}
+		}
+
         public static void FireEvent(IntPtr gameevent, bool dontbroadcast){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();
@@ -1085,6 +1127,16 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
+        public static void RemoveAllNetworkVectorElements(IntPtr vec){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.Push(vec);
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x67206C08);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			}
+		}
+
         public static short GetSchemaOffset(string classname, string propname){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();

managed/CounterStrikeSharp.API/Core/Application.cs

@@ -106,13 +106,13 @@ namespace CounterStrikeSharp.API.Core
         [RequiresPermissions("@css/generic")]
         private void OnCSSCommand(CCSPlayerController? caller, CommandInfo info)
         {
-            var currentVersion = Api.GetVersion();
+            var versionString = $"v{Api.GetVersion()} ({Api.GetVersionString()})";
 
             info.ReplyToCommand(
                 "  CounterStrikeSharp was created and is maintained by Michael \"roflmuffin\" Wilson.\n" +
                 "  Counter-Strike Sharp uses code borrowed from SourceMod, Source.Python, FiveM, Saul Rennison, source2gen and CS2Fixes.\n" +
                 "  See ACKNOWLEDGEMENTS.md for more information.\n" +
-                "  Current API Version: " + currentVersion);
+                "  Current API Version: " + versionString);
             return;
         }
 
@@ -130,11 +130,11 @@ namespace CounterStrikeSharp.API.Core
                     {
                         var sb = new StringBuilder();
                         sb.AppendFormat("  [#{0}:{1}]: \"{2}\" ({3})", plugin.PluginId,
-                            plugin.State.ToString().ToUpper(), plugin.Plugin.ModuleName,
-                            plugin.Plugin.ModuleVersion);
-                        if (!string.IsNullOrEmpty(plugin.Plugin.ModuleAuthor))
+                            plugin.State.ToString().ToUpper(), plugin.Plugin?.ModuleName ?? "Unknown",
+                            plugin.Plugin?.ModuleVersion ?? "Unknown");
+                        if (!string.IsNullOrEmpty(plugin.Plugin?.ModuleAuthor))
                             sb.AppendFormat(" by {0}", plugin.Plugin.ModuleAuthor);
-                        if (!string.IsNullOrEmpty(plugin.Plugin.ModuleDescription))
+                        if (!string.IsNullOrEmpty(plugin.Plugin?.ModuleDescription))
                         {
                             sb.Append("\n");
                             sb.Append("    ");

managed/CounterStrikeSharp.API/Core/BasePlugin.cs

@@ -122,9 +122,6 @@ namespace CounterStrikeSharp.API.Core
         public readonly Dictionary<Delegate, CallbackSubscriber> CommandListeners =
             new Dictionary<Delegate, CallbackSubscriber>();
 
-        public readonly Dictionary<Delegate, CallbackSubscriber> ConvarChangeHandlers =
-            new Dictionary<Delegate, CallbackSubscriber>();
-
         public readonly Dictionary<Delegate, CallbackSubscriber> Listeners =
             new Dictionary<Delegate, CallbackSubscriber>();
 
@@ -159,7 +156,23 @@ namespace CounterStrikeSharp.API.Core
             var name = typeof(T).GetCustomAttribute<EventNameAttribute>()?.Name;
             RegisterEventHandlerInternal(name, handler, hookMode == HookMode.Post);
         }
+        
+        /// <summary>
+        /// De-registers a game event handler.
+        /// </summary>
+        /// <inheritdoc cref="RegisterEventHandler{T}"/>
+        public void DeregisterEventHandler<T>(GameEventHandler<T> handler, HookMode hookMode = HookMode.Post) where T : GameEvent
+        {
+            var name = typeof(T).GetCustomAttribute<EventNameAttribute>()!.Name;
+            
+            if (!Handlers.TryGetValue(handler, out var subscriber)) return;
 
+            NativeAPI.UnhookEvent(name, subscriber.GetInputArgument(), hookMode == HookMode.Post);
+            FunctionReference.Remove(subscriber.GetReferenceIdentifier());
+            Handlers.Remove(handler);
+        }
+
+        [Obsolete("Use the generic version of this method")]
         public void DeregisterEventHandler(string name, Delegate handler, bool post)
         {
             if (!Handlers.TryGetValue(handler, out var subscriber)) return;
@@ -187,6 +200,12 @@ namespace CounterStrikeSharp.API.Core
             CommandManager.RegisterCommand(definition);
         }
 
+        /// <summary>
+        /// Adds a command listener which will be called before or after the command is executed on the server by a player.
+        /// </summary>
+        /// <param name="name">Name of the command, e.g. `jointeam`</param>
+        /// <param name="handler">Code to run when command is executed. Return <see cref="HookResult.Handled"/> or higher to prevent command execution.</param>
+        /// <param name="mode">Whether to hook before or after the command is executed.</param>
         public void AddCommandListener(string? name, CommandInfo.CommandListenerCallback handler, HookMode mode = HookMode.Pre)
         {
             var wrappedHandler = new Func<int, IntPtr, HookResult>((i, ptr) =>
@@ -202,6 +221,11 @@ namespace CounterStrikeSharp.API.Core
             CommandListeners[handler] = subscriber;
         }
 
+        /// <summary>
+        /// Removes a server command.
+        /// </summary>
+        /// <param name="name">The name of the command.</param>
+        /// <param name="handler">The callback function to be invoked when the command is executed.</param>
         public void RemoveCommand(string name, CommandInfo.CommandCallback handler)
         {
             if (CommandHandlers.ContainsKey(handler))
@@ -215,6 +239,10 @@ namespace CounterStrikeSharp.API.Core
             }
         }
 
+        /// <summary>
+        /// Remove a command listener.
+        /// </summary>
+        /// <inheritdoc cref="AddCommandListener"/>
         public void RemoveCommandListener(string name, CommandInfo.CommandListenerCallback handler, HookMode mode)
         {
             if (CommandListeners.ContainsKey(handler))
@@ -228,39 +256,24 @@ namespace CounterStrikeSharp.API.Core
             }
         }
 
-        /*
-
-        public void HookConVarChange(ConVar convar, ConVar.ConVarChangedCallback handler)
-        {
-            var wrappedHandler = new Action<IntPtr, string, string>((ptr, oldVal, newVal) =>
-            {
-                handler?.Invoke(new ConVar(ptr), oldVal, newVal);
-            });
-
-            var subscriber = new CallbackSubscriber(convar, handler, wrappedHandler);
-            NativeAPI.HookConvarChange(convar.Handle, subscriber.GetInputArgument());
-            ConvarChangeHandlers[handler] = subscriber;
-        }
-
-        public void UnhookConVarChange(ConVar convar, ConVar.ConVarChangedCallback handler)
-        {
-            if (ConvarChangeHandlers.ContainsKey(handler))
-            {
-                var subscriber = ConvarChangeHandlers[handler];
-
-                NativeAPI.UnhookConvarChange(convar.Handle, subscriber.GetInputArgument());
-                FunctionReference.Remove(subscriber.GetReferenceIdentifier());
-                CommandHandlers.Remove(handler);
-            }
-        }*/
-
-        // Adds global listener, e.g. OnTick, OnClientConnect
+        /// <summary>
+        /// Registers a global listener, e.g. <see cref="Listeners.OnTick"/>, <see cref="Listeners.OnClientConnect"/>.
+        /// </summary>
+        /// <param name="handler"></param>
+        /// <typeparam name="T">Listener delegate type</typeparam>
+        /// <exception cref="ArgumentException">Invalid listener <see cref="T"/> provided</exception>
+        /// <example>
+        /// <code lang="C#">
+        /// RegisterListener&lt;Listeners.OnTick&gt;(OnTick);
+        /// </code>
+        /// </example>
         public void RegisterListener<T>(T handler) where T : Delegate
         {
             var listenerName = typeof(T).GetCustomAttribute<ListenerNameAttribute>()?.Name;
             if (string.IsNullOrEmpty(listenerName))
             {
-                throw new Exception("Listener of type T is invalid and does not have a name attribute");
+                throw new ArgumentException("Listener of type T is invalid and does not have a name attribute",
+                    nameof(T));
             }
 
             var parameterTypes = typeof(T).GetMethod("Invoke").GetParameters().Select(p => p.ParameterType).ToArray();
@@ -291,6 +304,34 @@ namespace CounterStrikeSharp.API.Core
             Listeners[handler] = subscriber;
         }
 
+        /// <summary>
+        /// Removes a global listener.
+        /// </summary>
+        /// <param name="handler"></param>
+        /// <typeparam name="T"></typeparam>
+        /// <exception cref="ArgumentException">Invalid listener <see cref="T"/> provided</exception>
+        public void RemoveListener<T>(T handler) where T : Delegate
+        {
+            var listenerName = typeof(T).GetCustomAttribute<ListenerNameAttribute>()?.Name;
+            if (string.IsNullOrEmpty(listenerName))
+            {
+                throw new ArgumentException("Listener of type T is invalid and does not have a name attribute",
+                    nameof(T));
+            }
+            
+            if (!Listeners.TryGetValue(handler, out var subscriber)) return;
+            
+            NativeAPI.RemoveListener(listenerName, subscriber.GetInputArgument());
+            FunctionReference.Remove(subscriber.GetReferenceIdentifier());
+            Listeners.Remove(handler);
+        }
+
+        /// <summary>
+        /// Removes a global listener.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="handler"></param>
+        [Obsolete("Use the generic version of this method")]
         public void RemoveListener(string name, Delegate handler)
         {
             if (!Listeners.TryGetValue(handler, out var subscriber)) return;
@@ -300,6 +341,14 @@ namespace CounterStrikeSharp.API.Core
             Listeners.Remove(handler);
         }
 
+        /// <summary>
+        /// Adds a timer that will call the given callback after the specified amount of seconds.
+        /// By default will only run once unless the <see cref="TimerFlags.REPEAT"/> flag is set.
+        /// </summary>
+        /// <param name="interval">Interval/Delay in seconds</param>
+        /// <param name="callback">Code to run when timer elapses</param>
+        /// <param name="flags">Controls if the timer is a one-off, repeat or stops on map change etc.</param>
+        /// <returns>An instance of the <see cref="Timer"/></returns>
         public Timer AddTimer(float interval, Action callback, TimerFlags? flags = null)
         {
             var timer = new Timer(interval, callback, flags ?? 0);
@@ -307,7 +356,11 @@ namespace CounterStrikeSharp.API.Core
             return timer;
         }
 
-
+        /// <summary>
+        /// Registers all attribute handlers on the given instance.
+        /// Can be used to register event handlers, console commands, entity outputs etc. from classes that are not derived from `BasePlugin`.
+        /// </summary>
+        /// <param name="instance"></param>
         public void RegisterAllAttributes(object instance)
         {
             this.RegisterAttributeHandlers(instance);
@@ -342,7 +395,7 @@ namespace CounterStrikeSharp.API.Core
         }
 
         /// <summary>
-        /// Registers all game event handlers that are decorated with the `[GameEventHandler]` attribute.
+        /// Registers all game event handlers that are decorated with the <see cref="GameEventHandlerAttribute"/> attribute.
         /// </summary>
         /// <param name="instance">The instance of the object where the event handlers are defined.</param>
         public void RegisterAttributeHandlers(object instance)
@@ -372,6 +425,10 @@ namespace CounterStrikeSharp.API.Core
             }
         }
 
+        /// <summary>
+        /// Registers all console command handlers that are decorated with the <see cref="ConsoleCommandAttribute"/> attribute.
+        /// </summary>
+        /// <param name="instance">The instance of the object where the console command handlers are defined.</param>
         public void RegisterConsoleCommandAttributeHandlers(object instance)
         {
             var eventHandlers = instance.GetType()
@@ -399,6 +456,10 @@ namespace CounterStrikeSharp.API.Core
             }
         }
 
+        /// <summary>
+        /// Registers all entity output handlers that are decorated with the <see cref="EntityOutputHookAttribute"/> attribute.
+        /// </summary>
+        /// <param name="instance">The instance of the object where entity output hook handlers are defined.</param>
         public void RegisterEntityOutputAttributeHandlers(object instance)
         {
             var handlers = instance.GetType()
@@ -453,6 +514,12 @@ namespace CounterStrikeSharp.API.Core
             RegisterFakeConVars(instance.GetType(), instance);
         }
 
+        /// <summary>
+        /// Hooks an <a href="https://developer.valvesoftware.com/wiki/Inputs_and_Outputs">entity output</a>.
+        /// </summary>
+        /// <param name="classname">Classname to hook, or `*` for wildcard</param>
+        /// <param name="outputName">Output name to hook, or `*` for wildcard</param>
+        /// <param name="handler">Handler to call</param>
         public void HookEntityOutput(string classname, string outputName, EntityIO.EntityOutputHandler handler, HookMode mode = HookMode.Pre)
         {
             var subscriber = new CallbackSubscriber(handler, handler,
@@ -462,6 +529,10 @@ namespace CounterStrikeSharp.API.Core
             EntityOutputHooks[handler] = subscriber;
         }
 
+        /// <summary>
+        /// Unhooks an entity output.
+        /// </summary>
+        /// <inheritdoc cref="HookEntityOutput"/>
         public void UnhookEntityOutput(string classname, string outputName, EntityIO.EntityOutputHandler handler, HookMode mode = HookMode.Pre)
         {
             if (!EntityOutputHooks.TryGetValue(handler, out var subscriber)) return;
@@ -471,6 +542,12 @@ namespace CounterStrikeSharp.API.Core
             EntityOutputHooks.Remove(handler);
         }
 
+        /// <summary>
+        /// Hooks an entity output for a single entity instance.
+        /// </summary>
+        /// <param name="entityInstance">Entity instance to hook</param>
+        /// <param name="outputName">Output name to hook, or `*` for wildcard</param>
+        /// <param name="handler">Handler to call</param>
         public void HookSingleEntityOutput(CEntityInstance entityInstance, string outputName, EntityIO.EntityOutputHandler handler)
         {
             // since we wrap around the plugin handler we need to do this to ensure that the plugin callback is only called
@@ -494,6 +571,10 @@ namespace CounterStrikeSharp.API.Core
             EntitySingleOutputHooks[handler] = new EntityIO.EntityOutputCallback(entityInstance.DesignerName, outputName, internalHandler);
         }
 
+        /// <summary>
+        /// Unhooks an entity output for a single entity instance.
+        /// </summary>
+        /// <inheritdoc cref="HookSingleEntityOutput"/>
         public void UnhookSingleEntityOutput(CEntityInstance entityInstance, string outputName, EntityIO.EntityOutputHandler handler)
         {
             UnhookSingleEntityOutputInternal(entityInstance.DesignerName, outputName, handler);
@@ -532,10 +613,6 @@ namespace CounterStrikeSharp.API.Core
                 subscriber.Dispose();
             }
 
-            foreach (var kv in ConvarChangeHandlers)
-            {
-            }
-
             foreach (var subscriber in Listeners.Values)
             {
                 subscriber.Dispose();

managed/CounterStrikeSharp.API/Core/CoreConfig.cs

@@ -50,6 +50,9 @@ namespace CounterStrikeSharp.API.Core
         [JsonPropertyName("PluginHotReloadEnabled")]
         public bool PluginHotReloadEnabled { get; set; } = true;
         
+        [JsonPropertyName("PluginAutoLoadEnabled")]
+        public bool PluginAutoLoadEnabled { get; set; } = true;
+        
         [JsonPropertyName("ServerLanguage")]
         public string ServerLanguage { get; set; } = "en";
     }
@@ -95,7 +98,13 @@ namespace CounterStrikeSharp.API.Core
         /// </summary>
         public static bool PluginHotReloadEnabled => _coreConfig.PluginHotReloadEnabled;
         
+        /// <summary>
+        /// When enabled, plugins are automatically loaded from the plugins directory on server start.
+        /// </summary>
+        public static bool PluginAutoLoadEnabled => _coreConfig.PluginAutoLoadEnabled;
+        
         public static string ServerLanguage => _coreConfig.ServerLanguage;
+        
     }
 
     public partial class CoreConfig : IStartupService

managed/CounterStrikeSharp.API/Core/FunctionReference.cs

@@ -14,10 +14,9 @@
  *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace CounterStrikeSharp.API.Core
@@ -29,140 +28,149 @@ namespace CounterStrikeSharp.API.Core
     {
         /// <summary>Delegate will be removed after the first invocation.</summary> 
         SingleUse,
-        /// <summary>Delegate will remain in memory for the lifetime of the application.</summary>
+
+        /// <summary>Delegate will remain in memory for the lifetime of the application (or until <see cref="FunctionReference.Remove"/> is called).</summary>
         Permanent
     }
-    
+
+    /// <summary>
+    /// Represents a reference to a function that can be called from native code.
+    /// </summary>
     public class FunctionReference
     {
-        private readonly Delegate m_method;
-        
-        public FunctionLifetime Lifetime { get; set; } = FunctionLifetime.Permanent;
-
         public unsafe delegate void CallbackDelegate(fxScriptContext* context);
-        private CallbackDelegate s_callback;
 
-        private FunctionReference(Delegate method)
+        private static readonly ConcurrentDictionary<int, FunctionReference> IdToFunctionReferencesMap = new();
+        private static readonly ConcurrentDictionary<Delegate, FunctionReference> TargetMethodToFunctionReferencesMap = new();
+
+        private static readonly object ReferenceCounterLock = new();
+        private static int _referenceCounter;
+
+        private readonly Delegate _targetMethod;
+        private readonly CallbackDelegate _nativeCallback;
+
+        private readonly TaskCompletionSource _taskCompletionSource = new();
+
+        private FunctionReference(Delegate method, FunctionLifetime lifetime)
         {
-            m_method = method;
-
-            unsafe
-            {
-                var dg = new CallbackDelegate((fxScriptContext* context) =>
-                {
-                    try
-                    {
-                        var scriptContext = new ScriptContext(context);
-
-                        if (method.Method.GetParameters().FirstOrDefault()?.ParameterType == typeof(ScriptContext))
-                        {
-                            var returnO = m_method.DynamicInvoke(scriptContext);
-                            if (returnO != null)
-                            {
-                                scriptContext.SetResult(returnO, context);
-                            }
-
-                            return;
-                        }
-
-                        var paramsList = method.Method.GetParameters().Select((x, i) =>
-                        {
-                            var param = method.Method.GetParameters()[i];
-                            object obj = null;
-                            if (typeof(NativeObject).IsAssignableFrom(param.ParameterType))
-                            {
-                                obj = Activator.CreateInstance(param.ParameterType,
-                                    new[] { scriptContext.GetArgument(typeof(IntPtr), i) });
-                            }
-                            else
-                            {
-                                obj = scriptContext.GetArgument(param.ParameterType, i);
-                            }
-
-                            return obj;
-                        }).ToArray();
-
-                        var returnObj = m_method.DynamicInvoke(paramsList);
-
-                        if (returnObj != null)
-                        {
-                            scriptContext.SetResult(returnObj, context);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Application.Instance.Logger.LogError(e, "Error invoking callback");
-                    }
-                    finally
-                    {
-                        if (Lifetime == FunctionLifetime.SingleUse)
-                        {
-                            Remove(Identifier);
-                            if (references.ContainsKey(m_method))
-                                references.Remove(m_method);
-                        }
-                    }
-                });
-                s_callback = dg;
-            }
-
+            Lifetime = lifetime;
+            _targetMethod = method;
+            _nativeCallback = CreateWrappedCallback();
         }
+        
+        /// <summary>
+        /// <inheritdoc cref="FunctionLifetime"/>
+        /// </summary>
+        public FunctionLifetime Lifetime { get; }
+
+        /// <summary>
+        /// For <see cref="FunctionLifetime.SingleUse"/> function references, this task will complete when
+        /// the function has finished invoking.
+        /// </summary>
+        public Task CompletionTask => _taskCompletionSource.Task;
 
         public int Identifier { get; private set; }
 
-        public static FunctionReference Create(Delegate method)
+        private unsafe CallbackDelegate CreateWrappedCallback()
         {
-            if (references.ContainsKey(method))
+            return context =>
             {
-                return references[method];
+                try
+                {
+                    var scriptContext = new ScriptContext(context);
+
+                    // Allow for manual handling of the script context
+                    if (_targetMethod.Method.GetParameters().FirstOrDefault()?.ParameterType == typeof(ScriptContext))
+                    {
+                        var returnValue = _targetMethod.DynamicInvoke(scriptContext);
+                        if (returnValue != null)
+                        {
+                            scriptContext.SetResult(returnValue, context);
+                        }
+
+                        return;
+                    }
+
+                    var parameterList = _targetMethod.Method.GetParameters().Select((_, i) =>
+                    {
+                        var parameter = _targetMethod.Method.GetParameters()[i];
+                        return scriptContext.GetArgument(parameter.ParameterType, i);
+                    }).ToArray();
+
+                    var returnObj = _targetMethod.DynamicInvoke(parameterList);
+
+                    if (returnObj != null)
+                    {
+                        scriptContext.SetResult(returnObj, context);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Application.Instance.Logger.LogError(e, "Error invoking callback");
+                }
+                finally
+                {
+                    if (Lifetime == FunctionLifetime.SingleUse)
+                    {
+                        RemoveSelf();
+                    }
+
+                    _taskCompletionSource.TrySetResult();
+                }
+            };
+        }
+
+        public static FunctionReference Create(Delegate method, FunctionLifetime lifetime = FunctionLifetime.Permanent)
+        {
+            // We always want to create a new reference if the lifetime is single use.
+            if (lifetime == FunctionLifetime.Permanent && TargetMethodToFunctionReferencesMap.TryGetValue(method, out var existingReference))
+            {
+                return existingReference;
             }
 
-            var reference = new FunctionReference(method);
+            var reference = new FunctionReference(method, lifetime);
             var referenceId = Register(reference);
 
             reference.Identifier = referenceId;
-            
+
             return reference;
         }
 
-        private static Dictionary<int, FunctionReference> ms_references = new Dictionary<int, FunctionReference>();
-        private static int ms_referenceId;
-
-        private static Dictionary<Delegate, FunctionReference> references =
-            new Dictionary<Delegate, FunctionReference>();
 
         private static int Register(FunctionReference reference)
         {
-            var thisRefId = ms_referenceId;
-            ms_references[thisRefId] = reference;
-            references[reference.m_method] = reference;
-
-            unchecked { ms_referenceId++; }
-
-            return thisRefId;
-        }
-
-        public static FunctionReference Get(int reference)
-        {
-            if (ms_references.ContainsKey(reference))
+            lock (ReferenceCounterLock)
             {
-                return ms_references[reference];
-            }
+                var thisRefId = _referenceCounter;
+                IdToFunctionReferencesMap[thisRefId] = reference;
+                TargetMethodToFunctionReferencesMap[reference._targetMethod] = reference;
 
-            return null;
+                unchecked
+                {
+                    _referenceCounter++;
+                }
+
+                return thisRefId;
+            }
         }
-        
-        public IntPtr GetFunctionPointer()
+
+        public IntPtr GetFunctionPointer() => Marshal.GetFunctionPointerForDelegate(_nativeCallback);
+
+        private void RemoveSelf()
         {
-            IntPtr cb = Marshal.GetFunctionPointerForDelegate(s_callback);
-            return cb;
+            Remove(Identifier);
         }
 
         public static void Remove(int reference)
         {
-            if (ms_references.TryGetValue(reference, out var funcRef))
+            if (IdToFunctionReferencesMap.TryGetValue(reference, out var functionReference))
             {
-                ms_references.Remove(reference);
+                if (TargetMethodToFunctionReferencesMap.ContainsKey(functionReference._targetMethod))
+                {
+                    TargetMethodToFunctionReferencesMap.Remove(functionReference._targetMethod, out _);
+                }
+
+                IdToFunctionReferencesMap.Remove(reference, out _);
 
                 Application.Instance.Logger.LogDebug("Removing function/callback reference: {Reference}", reference);
             }

managed/CounterStrikeSharp.API/Core/IPlugin.cs

@@ -28,17 +28,23 @@ namespace CounterStrikeSharp.API.Core
     public interface IPlugin : IDisposable
     {
         /// <summary>
-        /// Name of the plugin.
+        /// Name of the plugin as it will appear in the plugin list.
         /// </summary>
         string ModuleName { get; }
 
         /// <summary>
-        /// Module version.
+        /// Module version as it will appear in the plugin list.
         /// </summary>
         string ModuleVersion { get; }
 
+        /// <summary>
+        /// Author of the plugin as it will appear in the plugin list.
+        /// </summary>
         string ModuleAuthor { get; }
 
+        /// <summary>
+        /// Brief description of the plugin as it will appear in the plugin list.
+        /// </summary>
         string ModuleDescription { get; }
 
         /// <summary>
@@ -61,12 +67,15 @@ namespace CounterStrikeSharp.API.Core
         /// <param name="hotReload"></param>
         void OnAllPluginsLoaded(bool hotReload);
 
+        /// <summary>
+        /// The path to the plugin's DLL file.
+        /// </summary>
         string ModulePath { get; internal set; }
 
         ILogger Logger { get; set; }
-        
+
         IStringLocalizer Localizer { get; set; }
-        
+
         ICommandManager CommandManager { get; set; }
 
         void RegisterAllAttributes(object instance);

managed/CounterStrikeSharp.API/Core/Model/CBaseEntity.cs

@@ -8,10 +8,14 @@ namespace CounterStrikeSharp.API.Core;
 public partial class CBaseEntity
 {
     /// <exception cref="InvalidOperationException">Entity is not valid</exception>
-    public void Teleport(Vector position, QAngle angles, Vector velocity)
+    public void Teleport(Vector? position = null, QAngle? angles = null, Vector? velocity = null)
     {
         Guard.IsValidEntity(this);
 
+        position ??= AbsOrigin!;
+        angles ??= AbsRotation!;
+        velocity ??= AbsVelocity;
+        
         VirtualFunction.CreateVoid<IntPtr, IntPtr, IntPtr, IntPtr>(Handle, GameData.GetOffset("CBaseEntity_Teleport"))(
             Handle, position.Handle, angles.Handle, velocity.Handle);
     }
@@ -39,6 +43,6 @@ public partial class CBaseEntity
     {
         Guard.IsValidEntity(this);
 
-        return (T) Activator.CreateInstance(typeof(T), Marshal.ReadIntPtr(SubclassID.Handle + 4));
+        return (T)Activator.CreateInstance(typeof(T), Marshal.ReadIntPtr(SubclassID.Handle + 4));
     }
 }

managed/CounterStrikeSharp.API/Core/Model/CCSGameRules.cs

@@ -26,6 +26,6 @@ public partial class CCSGameRules
     /// </summary>
     public void TerminateRound(float delay, RoundEndReason roundEndReason)
     {
-        VirtualFunctions.TerminateRound(Handle, roundEndReason, delay);
+        VirtualFunctions.TerminateRound(Handle, roundEndReason, delay, 0, 0);
     }
 }

managed/CounterStrikeSharp.API/Core/Model/CCSPlayerController.cs

@@ -16,17 +16,17 @@ public partial class CCSPlayerController
     /// <exception cref="InvalidOperationException">Entity is not valid</exception>
     public IntPtr GiveNamedItem(string item)
     {
-        Guard.IsValidEntity(this);
-
-        if (!PlayerPawn.IsValid) return 0;
-        if (PlayerPawn.Value == null) return 0;
-        if (!PlayerPawn.Value.IsValid) return 0;
-        if (PlayerPawn.Value.ItemServices == null) return 0;
-
-        return VirtualFunctions.GiveNamedItem(PlayerPawn.Value.ItemServices.Handle, item, 0, 0, 0, 0);
+        return GiveNamedItem<CEntityInstance>(item)?.Handle ?? IntPtr.Zero;
     }
 
-    public IntPtr GiveNamedItem(CsItem item) 
+    public T? GiveNamedItem<T>(string item) where T : CEntityInstance
+    {
+        Guard.IsValidEntity(this);
+
+        return PlayerPawn.Value?.ItemServices?.As<CCSPlayer_ItemServices>().GiveNamedItem<T>(item);
+    }
+
+    public IntPtr GiveNamedItem(CsItem item)
     {
         string? itemString = EnumUtils.GetEnumMemberAttributeValue(item);
         if (string.IsNullOrWhiteSpace(itemString))
@@ -61,6 +61,14 @@ public partial class CCSPlayerController
         VirtualFunctions.ClientPrint(Handle, HudDestination.Center, message, 0, 0, 0, 0);
     }
 
+    /// <exception cref="InvalidOperationException">Entity is not valid</exception>
+    public void PrintToCenterAlert(string message)
+    {
+        Guard.IsValidEntity(this);
+
+        VirtualFunctions.ClientPrint(Handle, HudDestination.Alert, message, 0, 0, 0, 0);
+    }
+
     public void PrintToCenterHtml(string message) => PrintToCenterHtml(message, 5);
 
     /// <exception cref="InvalidOperationException">Entity is not valid</exception>
@@ -75,6 +83,7 @@ public partial class CCSPlayerController
             Userid = this
         };
         @event.FireEventToClient(this);
+        @event.Free();
     }
 
     /// <summary>
@@ -84,17 +93,13 @@ public partial class CCSPlayerController
     public void DropActiveWeapon()
     {
         Guard.IsValidEntity(this);
-        if (!PlayerPawn.IsValid) return;
-        if (PlayerPawn.Value == null) return;
-        if (!PlayerPawn.Value.IsValid) return;
-        if (PlayerPawn.Value.ItemServices == null) return;
-        if (PlayerPawn.Value.WeaponServices == null) return;
-        if (!PlayerPawn.Value.WeaponServices.ActiveWeapon.IsValid) return;
 
-        CCSPlayer_ItemServices itemServices = new CCSPlayer_ItemServices(PlayerPawn.Value.ItemServices.Handle);
-        CCSPlayer_WeaponServices weaponServices = new CCSPlayer_WeaponServices(PlayerPawn.Value.WeaponServices.Handle);
-        
-        itemServices.DropActivePlayerWeapon(weaponServices.ActiveWeapon.Value);
+        var itemServices = PlayerPawn.Value?.ItemServices?.As<CCSPlayer_ItemServices>();
+        var activeWeapon = PlayerPawn.Value?.WeaponServices?.ActiveWeapon.Value;
+
+        if (activeWeapon == null || itemServices == null) return;
+
+        itemServices.DropActivePlayerWeapon(activeWeapon);
     }
 
     /// <summary>
@@ -104,13 +109,8 @@ public partial class CCSPlayerController
     public void RemoveWeapons()
     {
         Guard.IsValidEntity(this);
-        if (!PlayerPawn.IsValid) return;
-        if (PlayerPawn.Value == null) return;
-        if (!PlayerPawn.Value.IsValid) return;
-        if (PlayerPawn.Value.ItemServices == null) return;
 
-        CCSPlayer_ItemServices itemServices = new CCSPlayer_ItemServices(PlayerPawn.Value.ItemServices.Handle);
-        itemServices.RemoveWeapons();
+        PlayerPawn.Value?.ItemServices?.As<CCSPlayer_ItemServices>().RemoveWeapons();
     }
 
     /// <summary>
@@ -122,11 +122,8 @@ public partial class CCSPlayerController
     public void CommitSuicide(bool explode, bool force)
     {
         Guard.IsValidEntity(this);
-        if (!PlayerPawn.IsValid) return;
-        if (PlayerPawn.Value == null) return;
-        if (!PlayerPawn.Value.IsValid) return;
 
-        PlayerPawn.Value.CommitSuicide(explode, force);
+        PlayerPawn.Value?.CommitSuicide(explode, force);
     }
 
     /// <summary>
@@ -136,9 +133,7 @@ public partial class CCSPlayerController
     public void Respawn()
     {
         Guard.IsValidEntity(this);
-        if (!PlayerPawn.IsValid) return;
         if (PlayerPawn.Value == null) return;
-        if (!PlayerPawn.Value.IsValid) return;
 
         // The Call To Arms update appears to have invalidated the need for CCSPlayerPawn_Respawn.
         SetPawn(PlayerPawn.Value);

managed/CounterStrikeSharp.API/Core/Model/CCSPlayer_ItemServices.cs

@@ -45,4 +45,13 @@ public partial class CCSPlayer_ItemServices
 
         VirtualFunction.CreateVoid<nint>(Handle, GameData.GetOffset("CCSPlayer_ItemServices_RemoveWeapons"))(Handle);
     }
-}
+
+    public T? GiveNamedItem<T>(string item) where T : CEntityInstance
+    {
+        var pointer = VirtualFunction.Create<nint, string, nint>(Handle, GameData.GetOffset("CCSPlayer_ItemServices_GiveNamedItem"))(Handle, item);
+        if (pointer == IntPtr.Zero)
+            return null;
+
+        return (T)Activator.CreateInstance(typeof(T), pointer)!;
+    }
+}

managed/CounterStrikeSharp.API/Core/Model/CEntityInstance.cs

@@ -65,7 +65,7 @@ public partial class CEntityInstance : IEquatable<CEntityInstance>
     }
 
     /// <summary>
-    /// Calls a named input method on an entity.
+    /// Calls a named input method on an entity, this will bypass the map IO event queue system.
     /// <example>
     /// <code>
     /// entity.AcceptInput("Break");
@@ -82,7 +82,30 @@ public partial class CEntityInstance : IEquatable<CEntityInstance>
     {
         Guard.IsValidEntity(this);
 
-        VirtualFunctions.AcceptInput(Handle, inputName, activator?.Handle ?? IntPtr.Zero, caller?.Handle ?? IntPtr.Zero, value, 0);
+        NativeAPI.AcceptInput(Handle, inputName, activator?.Handle ?? IntPtr.Zero, caller?.Handle ?? IntPtr.Zero, value, outputId);
+    }
+
+
+    /// <summary>
+    /// Calls a named input method on an entity, conforming to the map IO event queue system.
+    /// <example>
+    /// <code>
+    /// entity.AddEntityIOEvent("Break");
+    /// </code>
+    /// </example>
+    /// </summary>
+    /// <param name="inputName">Input action name</param>
+    /// <param name="activator">Entity which initiated the action, <see langword="null"/> for no entity</param>
+    /// <param name="caller">Entity that is sending the event, <see langword="null"/> for no entity</param>
+    /// <param name="value">String variant value to send with the event</param>
+    /// <param name="delay">Delay in seconds before calling the input</param>
+    /// <param name="outputId">Unknown, defaults to 0</param>
+    /// <exception cref="InvalidOperationException">Entity is not valid</exception>
+    public void AddEntityIOEvent(string inputName, CEntityInstance? activator = null, CEntityInstance? caller = null, string value = "", float delay = 0, int outputId = 0)
+    {
+        Guard.IsValidEntity(this);
+
+        NativeAPI.AddEntityIoEvent(Handle, inputName, activator?.Handle ?? IntPtr.Zero, caller?.Handle ?? IntPtr.Zero, value, delay, outputId);
     }
 }
 
@@ -90,4 +113,4 @@ public partial class CEntityIdentity
 {
     public unsafe CEntityInstance EntityInstance => new(Unsafe.Read<IntPtr>((void*)Handle));
     public unsafe CHandle<CEntityInstance> EntityHandle => new(this.Handle + 0x10);
-}
+}

managed/CounterStrikeSharp.API/Core/Model/NetworkedVector.cs

@@ -33,6 +33,11 @@ public partial class NetworkedVector<T> : NativeObject, IReadOnlyCollection<T>
         }
     }
 
+    public void RemoveAll()
+    {
+        NativeAPI.RemoveAllNetworkVectorElements(Handle);
+    }
+
     public IEnumerator<T> GetEnumerator()
     {
         for (int i = 0; i < Count; i++)

managed/CounterStrikeSharp.API/Core/Plugin/Host/PluginManager.cs

@@ -1,8 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Loader;
+using CounterStrikeSharp.API.Core.Capabilities;
 using CounterStrikeSharp.API.Core.Commands;
 using CounterStrikeSharp.API.Core.Hosting;
+using McMaster.NETCore.Plugins;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -15,8 +18,11 @@ public class PluginManager : IPluginManager
     private readonly ICommandManager _commandManager;
     private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<PluginManager> _logger;
+    private readonly Dictionary<string, Assembly> _sharedAssemblies = new();
+    private bool _loadedSharedLibs = false;
 
-    public PluginManager(IScriptHostConfiguration scriptHostConfiguration, ICommandManager commandManager, ILogger<PluginManager> logger, IServiceProvider serviceProvider, IServiceScopeFactory serviceScopeFactory)
+    public PluginManager(IScriptHostConfiguration scriptHostConfiguration, ICommandManager commandManager,
+        ILogger<PluginManager> logger, IServiceProvider serviceProvider, IServiceScopeFactory serviceScopeFactory)
     {
         _scriptHostConfiguration = scriptHostConfiguration;
         _commandManager = commandManager;
@@ -24,6 +30,36 @@ public class PluginManager : IPluginManager
         _serviceProvider = serviceProvider;
     }
 
+    private void LoadLibrary(string path)
+    {
+        var loader = PluginLoader.CreateFromAssemblyFile(path, new[] { typeof(IPlugin), typeof(PluginCapability<>), typeof(PlayerCapability<>) },
+            config => { config.PreferSharedTypes = true; });
+        var assembly = loader.LoadDefaultAssembly();
+
+        _sharedAssemblies[assembly.GetName().Name] = assembly;
+    }
+
+    private void LoadSharedLibraries()
+    {
+        var sharedDirectory = Directory.GetDirectories(_scriptHostConfiguration.SharedPath);
+        var sharedAssemblyPaths = sharedDirectory
+            .Select(dir => Path.Combine(dir, Path.GetFileName(dir) + ".dll"))
+            .Where(File.Exists)
+            .ToArray();
+        
+        foreach (var sharedAssemblyPath in sharedAssemblyPaths)
+        {
+            try
+            {
+                LoadLibrary(sharedAssemblyPath);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Failed to load shared assembly from {Path}", sharedAssemblyPath);
+            }
+        }
+    }
+
     public void Load()
     {
         var pluginDirectories = Directory.GetDirectories(_scriptHostConfiguration.PluginPath);
@@ -31,39 +67,48 @@ public class PluginManager : IPluginManager
             .Select(dir => Path.Combine(dir, Path.GetFileName(dir) + ".dll"))
             .Where(File.Exists)
             .ToArray();
-        
-        var sharedDirectory = Directory.GetDirectories(_scriptHostConfiguration.SharedPath);
-        var sharedAssemblyPaths = sharedDirectory
-            .Select(dir => Path.Combine(dir, Path.GetFileName(dir) + ".dll"))
-            .Where(File.Exists)
-            .ToArray();
 
-        foreach (var sharedAssemblyPath in sharedAssemblyPaths)
+        AssemblyLoadContext.Default.Resolving += (context, name) =>
         {
-            try
+            if (!_loadedSharedLibs)
             {
-               AssemblyLoadContext.Default.LoadFromAssemblyPath(sharedAssemblyPath);
-            } catch (Exception e)
-            {
-                _logger.LogError(e, "Failed to load shared assembly from {Path}", sharedAssemblyPath);
+                LoadSharedLibraries();
+                _loadedSharedLibs = true;
             }
-        }
 
-        foreach (var path in pluginAssemblyPaths)
-        {
-            try
+            if (!_sharedAssemblies.TryGetValue(name.Name, out var assembly))
             {
-                LoadPlugin(path);
+                return null;
             }
-            catch (Exception e)
+
+            return assembly;
+        };
+
+        if (CoreConfig.PluginAutoLoadEnabled)
+        {
+            foreach (var path in pluginAssemblyPaths)
             {
-                _logger.LogError(e, "Failed to load plugin from {Path}", path);
+                try
+                {
+                    LoadPlugin(path);
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError(e, "Failed to load plugin from {Path}", path);
+                }
             }
         }
         
         foreach (var plugin in _loadedPluginContexts)
         {
-            plugin.Plugin.OnAllPluginsLoaded(false);
+            try
+            {
+                plugin.Plugin?.OnAllPluginsLoaded(false);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "OnAllPluginsLoaded failed");
+            }
         }
     }
 
@@ -74,8 +119,9 @@ public class PluginManager : IPluginManager
 
     public void LoadPlugin(string path)
     {
-        var plugin = new PluginContext(_serviceProvider, _commandManager, _scriptHostConfiguration, path, _loadedPluginContexts.Select(x => x.PluginId).DefaultIfEmpty(0).Max() + 1);
+        var plugin = new PluginContext(_serviceProvider, _commandManager, _scriptHostConfiguration, path,
+            _loadedPluginContexts.Select(x => x.PluginId).DefaultIfEmpty(0).Max() + 1);
         _loadedPluginContexts.Add(plugin);
         plugin.Load();
     }
-}
+}

managed/CounterStrikeSharp.API/Core/Plugin/PluginContext.cs

@@ -18,6 +18,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Core.Capabilities;
 using CounterStrikeSharp.API.Core.Commands;
 using CounterStrikeSharp.API.Core.Hosting;
 using CounterStrikeSharp.API.Core.Logging;
@@ -76,7 +77,7 @@ namespace CounterStrikeSharp.API.Core.Plugin
                     config.IsUnloadable = true;
                     config.PreferSharedTypes = true;
                 });
-
+            
             if (CoreConfig.PluginHotReloadEnabled)
             {
                 _fileWatcher = new FileSystemWatcher
@@ -119,12 +120,12 @@ namespace CounterStrikeSharp.API.Core.Plugin
         public void Load(bool hotReload = false)
         {
             if (State == PluginState.Loaded) return;
-
+            
             using (Loader.EnterContextualReflection())
             {
                 var defaultAssembly = Loader.LoadDefaultAssembly();
 
-                Type pluginType = defaultAssembly.GetTypes()
+                Type pluginType = defaultAssembly.GetExportedTypes()
                     .FirstOrDefault(t => typeof(IPlugin).IsAssignableFrom(t));
 
                 if (pluginType == null) throw new Exception("Unable to find plugin in assembly");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseCSGrenade.g.cs

@@ -54,6 +54,10 @@ public partial class CBaseCSGrenade : CCSWeaponBase
 	[SchemaMember("CBaseCSGrenade", "m_fDropTime")]
 	public ref float DropTime => ref Schema.GetRef<float>(this.Handle, "CBaseCSGrenade", "m_fDropTime");
 
+	// m_fPinPullTime
+	[SchemaMember("CBaseCSGrenade", "m_fPinPullTime")]
+	public ref float PinPullTime => ref Schema.GetRef<float>(this.Handle, "CBaseCSGrenade", "m_fPinPullTime");
+
 	// m_bJustPulledPin
 	[SchemaMember("CBaseCSGrenade", "m_bJustPulledPin")]
 	public ref bool JustPulledPin => ref Schema.GetRef<bool>(this.Handle, "CBaseCSGrenade", "m_bJustPulledPin");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CBaseIssue.g.cs

@@ -31,7 +31,7 @@ public partial class CBaseIssue : NativeObject
 	public string DetailsString
 	{
 		get { return Schema.GetString(this.Handle, "CBaseIssue", "m_szDetailsString"); }
-		set { Schema.SetStringBytes(this.Handle, "CBaseIssue", "m_szDetailsString", value, 260); }
+		set { Schema.SetStringBytes(this.Handle, "CBaseIssue", "m_szDetailsString", value, 4096); }
 	}
 
 	// m_iNumYesVotes

managed/CounterStrikeSharp.API/Core/Schema/Classes/CC4.g.cs

@@ -62,8 +62,4 @@ public partial class CC4 : CCSWeaponBase
 	[SchemaMember("CC4", "m_bBombPlanted")]
 	public ref bool BombPlanted => ref Schema.GetRef<bool>(this.Handle, "CC4", "m_bBombPlanted");
 
-	// m_bDroppedFromDeath
-	[SchemaMember("CC4", "m_bDroppedFromDeath")]
-	public ref bool DroppedFromDeath => ref Schema.GetRef<bool>(this.Handle, "CC4", "m_bDroppedFromDeath");
-
 }

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSGameRules.g.cs

@@ -450,6 +450,10 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_arrSelectedHostageSpawnIndices")]
 	public NetworkedVector<Int32> SelectedHostageSpawnIndices => Schema.GetDeclaredClass<NetworkedVector<Int32>>(this.Handle, "CCSGameRules", "m_arrSelectedHostageSpawnIndices");
 
+	// m_nSpawnPointsRandomSeed
+	[SchemaMember("CCSGameRules", "m_nSpawnPointsRandomSeed")]
+	public ref Int32 SpawnPointsRandomSeed => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_nSpawnPointsRandomSeed");
+
 	// m_bFirstConnected
 	[SchemaMember("CCSGameRules", "m_bFirstConnected")]
 	public ref bool FirstConnected => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bFirstConnected");
@@ -482,6 +486,10 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_numQueuedMatchmakingAccounts")]
 	public ref UInt32 NumQueuedMatchmakingAccounts => ref Schema.GetRef<UInt32>(this.Handle, "CCSGameRules", "m_numQueuedMatchmakingAccounts");
 
+	// m_fAvgPlayerRank
+	[SchemaMember("CCSGameRules", "m_fAvgPlayerRank")]
+	public ref float AvgPlayerRank => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_fAvgPlayerRank");
+
 	// m_pQueuedMatchmakingReservationString
 	[SchemaMember("CCSGameRules", "m_pQueuedMatchmakingReservationString")]
 	public string QueuedMatchmakingReservationString
@@ -686,14 +694,26 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_TerroristSpawnPointsMasterList")]
 	public NetworkedVector<SpawnPoint?> TerroristSpawnPointsMasterList => Schema.GetDeclaredClass<NetworkedVector<SpawnPoint?>>(this.Handle, "CCSGameRules", "m_TerroristSpawnPointsMasterList");
 
+	// m_bRespawningAllRespawnablePlayers
+	[SchemaMember("CCSGameRules", "m_bRespawningAllRespawnablePlayers")]
+	public ref bool RespawningAllRespawnablePlayers => ref Schema.GetRef<bool>(this.Handle, "CCSGameRules", "m_bRespawningAllRespawnablePlayers");
+
 	// m_iNextCTSpawnPoint
 	[SchemaMember("CCSGameRules", "m_iNextCTSpawnPoint")]
 	public ref Int32 NextCTSpawnPoint => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_iNextCTSpawnPoint");
 
+	// m_flCTSpawnPointUsedTime
+	[SchemaMember("CCSGameRules", "m_flCTSpawnPointUsedTime")]
+	public ref float CTSpawnPointUsedTime => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_flCTSpawnPointUsedTime");
+
 	// m_iNextTerroristSpawnPoint
 	[SchemaMember("CCSGameRules", "m_iNextTerroristSpawnPoint")]
 	public ref Int32 NextTerroristSpawnPoint => ref Schema.GetRef<Int32>(this.Handle, "CCSGameRules", "m_iNextTerroristSpawnPoint");
 
+	// m_flTerroristSpawnPointUsedTime
+	[SchemaMember("CCSGameRules", "m_flTerroristSpawnPointUsedTime")]
+	public ref float TerroristSpawnPointUsedTime => ref Schema.GetRef<float>(this.Handle, "CCSGameRules", "m_flTerroristSpawnPointUsedTime");
+
 	// m_CTSpawnPoints
 	[SchemaMember("CCSGameRules", "m_CTSpawnPoints")]
 	public NetworkedVector<SpawnPoint?> CTSpawnPoints => Schema.GetDeclaredClass<NetworkedVector<SpawnPoint?>>(this.Handle, "CCSGameRules", "m_CTSpawnPoints");
@@ -878,10 +898,6 @@ public partial class CCSGameRules : CTeamplayRules
 	[SchemaMember("CCSGameRules", "m_nRoundStartCount")]
 	public ref byte RoundStartCount => ref Schema.GetRef<byte>(this.Handle, "CCSGameRules", "m_nRoundStartCount");
 
-	// m_nRoundStartTicks
-	[SchemaMember("CCSGameRules", "m_nRoundStartTicks")]
-	public NetworkedVector<Int32> RoundStartTicks => Schema.GetDeclaredClass<NetworkedVector<Int32>>(this.Handle, "CCSGameRules", "m_nRoundStartTicks");
-
 	// m_flLastPerfSampleTime
 	[SchemaMember("CCSGameRules", "m_flLastPerfSampleTime")]
 	public ref double LastPerfSampleTime => ref Schema.GetRef<double>(this.Handle, "CCSGameRules", "m_flLastPerfSampleTime");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerController.g.cs

@@ -294,6 +294,22 @@ public partial class CCSPlayerController : CBasePlayerController
 	[SchemaMember("CCSPlayerController", "m_vecKills")]
 	public NetworkedVector<EKillTypes_t> Kills => Schema.GetDeclaredClass<NetworkedVector<EKillTypes_t>>(this.Handle, "CCSPlayerController", "m_vecKills");
 
+	// m_bMvpNoMusic
+	[SchemaMember("CCSPlayerController", "m_bMvpNoMusic")]
+	public ref bool MvpNoMusic => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerController", "m_bMvpNoMusic");
+
+	// m_eMvpReason
+	[SchemaMember("CCSPlayerController", "m_eMvpReason")]
+	public ref Int32 MvpReason => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController", "m_eMvpReason");
+
+	// m_iMusicKitID
+	[SchemaMember("CCSPlayerController", "m_iMusicKitID")]
+	public ref Int32 MusicKitID => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController", "m_iMusicKitID");
+
+	// m_iMusicKitMVPs
+	[SchemaMember("CCSPlayerController", "m_iMusicKitMVPs")]
+	public ref Int32 MusicKitMVPs => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController", "m_iMusicKitMVPs");
+
 	// m_iMVPs
 	[SchemaMember("CCSPlayerController", "m_iMVPs")]
 	public ref Int32 MVPs => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController", "m_iMVPs");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerController_InGameMoneyServices.g.cs

@@ -22,9 +22,9 @@ public partial class CCSPlayerController_InGameMoneyServices : CPlayerController
 	[SchemaMember("CCSPlayerController_InGameMoneyServices", "m_bReceivesMoneyNextRound")]
 	public ref bool ReceivesMoneyNextRound => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerController_InGameMoneyServices", "m_bReceivesMoneyNextRound");
 
-	// m_iAccountMoneyEarnedForNextRound
-	[SchemaMember("CCSPlayerController_InGameMoneyServices", "m_iAccountMoneyEarnedForNextRound")]
-	public ref Int32 AccountMoneyEarnedForNextRound => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController_InGameMoneyServices", "m_iAccountMoneyEarnedForNextRound");
+	// m_iMoneyEarnedForNextRound
+	[SchemaMember("CCSPlayerController_InGameMoneyServices", "m_iMoneyEarnedForNextRound")]
+	public ref Int32 MoneyEarnedForNextRound => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerController_InGameMoneyServices", "m_iMoneyEarnedForNextRound");
 
 	// m_iAccount
 	[SchemaMember("CCSPlayerController_InGameMoneyServices", "m_iAccount")]

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerPawn.g.cs

@@ -46,10 +46,6 @@ public partial class CCSPlayerPawn : CCSPlayerPawnBase
 	[SchemaMember("CCSPlayerPawn", "m_nCharacterDefIndex")]
 	public ref UInt16 CharacterDefIndex => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawn", "m_nCharacterDefIndex");
 
-	// m_hPreviousModel
-	[SchemaMember("CCSPlayerPawn", "m_hPreviousModel")]
-	public CStrongHandle<InfoForResourceTypeCModel> PreviousModel => Schema.GetDeclaredClass<CStrongHandle<InfoForResourceTypeCModel>>(this.Handle, "CCSPlayerPawn", "m_hPreviousModel");
-
 	// m_bHasFemaleVoice
 	[SchemaMember("CCSPlayerPawn", "m_bHasFemaleVoice")]
 	public ref bool HasFemaleVoice => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bHasFemaleVoice");
@@ -78,6 +74,10 @@ public partial class CCSPlayerPawn : CCSPlayerPawnBase
 	[SchemaMember("CCSPlayerPawn", "m_bInBuyZone")]
 	public ref bool InBuyZone => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bInBuyZone");
 
+	// m_TouchingBuyZones
+	[SchemaMember("CCSPlayerPawn", "m_TouchingBuyZones")]
+	public NetworkedVector<CHandle<CBaseEntity>> TouchingBuyZones => Schema.GetDeclaredClass<NetworkedVector<CHandle<CBaseEntity>>>(this.Handle, "CCSPlayerPawn", "m_TouchingBuyZones");
+
 	// m_bWasInBuyZone
 	[SchemaMember("CCSPlayerPawn", "m_bWasInBuyZone")]
 	public ref bool WasInBuyZone => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bWasInBuyZone");
@@ -122,9 +122,9 @@ public partial class CCSPlayerPawn : CCSPlayerPawnBase
 	[SchemaMember("CCSPlayerPawn", "m_flHealthShotBoostExpirationTime")]
 	public ref float HealthShotBoostExpirationTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flHealthShotBoostExpirationTime");
 
-	// m_flLandseconds
-	[SchemaMember("CCSPlayerPawn", "m_flLandseconds")]
-	public ref float Landseconds => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flLandseconds");
+	// m_flLandingTimeSeconds
+	[SchemaMember("CCSPlayerPawn", "m_flLandingTimeSeconds")]
+	public ref float LandingTimeSeconds => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flLandingTimeSeconds");
 
 	// m_aimPunchAngle
 	[SchemaMember("CCSPlayerPawn", "m_aimPunchAngle")]
@@ -226,4 +226,284 @@ public partial class CCSPlayerPawn : CCSPlayerPawnBase
 	[SchemaMember("CCSPlayerPawn", "m_bSkipOneHeadConstraintUpdate")]
 	public ref bool SkipOneHeadConstraintUpdate => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bSkipOneHeadConstraintUpdate");
 
+	// m_bLeftHanded
+	[SchemaMember("CCSPlayerPawn", "m_bLeftHanded")]
+	public ref bool LeftHanded => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bLeftHanded");
+
+	// m_fSwitchedHandednessTime
+	[SchemaMember("CCSPlayerPawn", "m_fSwitchedHandednessTime")]
+	public ref float SwitchedHandednessTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_fSwitchedHandednessTime");
+
+	// m_flViewmodelOffsetX
+	[SchemaMember("CCSPlayerPawn", "m_flViewmodelOffsetX")]
+	public ref float ViewmodelOffsetX => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flViewmodelOffsetX");
+
+	// m_flViewmodelOffsetY
+	[SchemaMember("CCSPlayerPawn", "m_flViewmodelOffsetY")]
+	public ref float ViewmodelOffsetY => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flViewmodelOffsetY");
+
+	// m_flViewmodelOffsetZ
+	[SchemaMember("CCSPlayerPawn", "m_flViewmodelOffsetZ")]
+	public ref float ViewmodelOffsetZ => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flViewmodelOffsetZ");
+
+	// m_flViewmodelFOV
+	[SchemaMember("CCSPlayerPawn", "m_flViewmodelFOV")]
+	public ref float ViewmodelFOV => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flViewmodelFOV");
+
+	// m_bIsWalking
+	[SchemaMember("CCSPlayerPawn", "m_bIsWalking")]
+	public ref bool IsWalking => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bIsWalking");
+
+	// m_fLastGivenDefuserTime
+	[SchemaMember("CCSPlayerPawn", "m_fLastGivenDefuserTime")]
+	public ref float LastGivenDefuserTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_fLastGivenDefuserTime");
+
+	// m_fLastGivenBombTime
+	[SchemaMember("CCSPlayerPawn", "m_fLastGivenBombTime")]
+	public ref float LastGivenBombTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_fLastGivenBombTime");
+
+	// m_flDealtDamageToEnemyMostRecentTimestamp
+	[SchemaMember("CCSPlayerPawn", "m_flDealtDamageToEnemyMostRecentTimestamp")]
+	public ref float DealtDamageToEnemyMostRecentTimestamp => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flDealtDamageToEnemyMostRecentTimestamp");
+
+	// m_iDisplayHistoryBits
+	[SchemaMember("CCSPlayerPawn", "m_iDisplayHistoryBits")]
+	public ref UInt32 DisplayHistoryBits => ref Schema.GetRef<UInt32>(this.Handle, "CCSPlayerPawn", "m_iDisplayHistoryBits");
+
+	// m_flLastAttackedTeammate
+	[SchemaMember("CCSPlayerPawn", "m_flLastAttackedTeammate")]
+	public ref float LastAttackedTeammate => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flLastAttackedTeammate");
+
+	// m_allowAutoFollowTime
+	[SchemaMember("CCSPlayerPawn", "m_allowAutoFollowTime")]
+	public ref float AllowAutoFollowTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_allowAutoFollowTime");
+
+	// m_bResetArmorNextSpawn
+	[SchemaMember("CCSPlayerPawn", "m_bResetArmorNextSpawn")]
+	public ref bool ResetArmorNextSpawn => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bResetArmorNextSpawn");
+
+	// m_nLastKillerIndex
+	[SchemaMember("CCSPlayerPawn", "m_nLastKillerIndex")]
+	public CEntityIndex LastKillerIndex => Schema.GetDeclaredClass<CEntityIndex>(this.Handle, "CCSPlayerPawn", "m_nLastKillerIndex");
+
+	// m_entitySpottedState
+	[SchemaMember("CCSPlayerPawn", "m_entitySpottedState")]
+	public EntitySpottedState_t EntitySpottedState => Schema.GetDeclaredClass<EntitySpottedState_t>(this.Handle, "CCSPlayerPawn", "m_entitySpottedState");
+
+	// m_nSpotRules
+	[SchemaMember("CCSPlayerPawn", "m_nSpotRules")]
+	public ref Int32 SpotRules => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_nSpotRules");
+
+	// m_bIsScoped
+	[SchemaMember("CCSPlayerPawn", "m_bIsScoped")]
+	public ref bool IsScoped => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bIsScoped");
+
+	// m_bResumeZoom
+	[SchemaMember("CCSPlayerPawn", "m_bResumeZoom")]
+	public ref bool ResumeZoom => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bResumeZoom");
+
+	// m_bIsDefusing
+	[SchemaMember("CCSPlayerPawn", "m_bIsDefusing")]
+	public ref bool IsDefusing => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bIsDefusing");
+
+	// m_bIsGrabbingHostage
+	[SchemaMember("CCSPlayerPawn", "m_bIsGrabbingHostage")]
+	public ref bool IsGrabbingHostage => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bIsGrabbingHostage");
+
+	// m_iBlockingUseActionInProgress
+	[SchemaMember("CCSPlayerPawn", "m_iBlockingUseActionInProgress")]
+	public ref CSPlayerBlockingUseAction_t BlockingUseActionInProgress => ref Schema.GetRef<CSPlayerBlockingUseAction_t>(this.Handle, "CCSPlayerPawn", "m_iBlockingUseActionInProgress");
+
+	// m_flEmitSoundTime
+	[SchemaMember("CCSPlayerPawn", "m_flEmitSoundTime")]
+	public ref float EmitSoundTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flEmitSoundTime");
+
+	// m_bInNoDefuseArea
+	[SchemaMember("CCSPlayerPawn", "m_bInNoDefuseArea")]
+	public ref bool InNoDefuseArea => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bInNoDefuseArea");
+
+	// m_iBombSiteIndex
+	[SchemaMember("CCSPlayerPawn", "m_iBombSiteIndex")]
+	public CEntityIndex BombSiteIndex => Schema.GetDeclaredClass<CEntityIndex>(this.Handle, "CCSPlayerPawn", "m_iBombSiteIndex");
+
+	// m_nWhichBombZone
+	[SchemaMember("CCSPlayerPawn", "m_nWhichBombZone")]
+	public ref Int32 WhichBombZone => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_nWhichBombZone");
+
+	// m_bInBombZoneTrigger
+	[SchemaMember("CCSPlayerPawn", "m_bInBombZoneTrigger")]
+	public ref bool InBombZoneTrigger => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bInBombZoneTrigger");
+
+	// m_bWasInBombZoneTrigger
+	[SchemaMember("CCSPlayerPawn", "m_bWasInBombZoneTrigger")]
+	public ref bool WasInBombZoneTrigger => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bWasInBombZoneTrigger");
+
+	// m_iShotsFired
+	[SchemaMember("CCSPlayerPawn", "m_iShotsFired")]
+	public ref Int32 ShotsFired => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_iShotsFired");
+
+	// m_flFlinchStack
+	[SchemaMember("CCSPlayerPawn", "m_flFlinchStack")]
+	public ref float FlinchStack => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flFlinchStack");
+
+	// m_flVelocityModifier
+	[SchemaMember("CCSPlayerPawn", "m_flVelocityModifier")]
+	public ref float VelocityModifier => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flVelocityModifier");
+
+	// m_flHitHeading
+	[SchemaMember("CCSPlayerPawn", "m_flHitHeading")]
+	public ref float HitHeading => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flHitHeading");
+
+	// m_nHitBodyPart
+	[SchemaMember("CCSPlayerPawn", "m_nHitBodyPart")]
+	public ref Int32 HitBodyPart => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_nHitBodyPart");
+
+	// m_vecTotalBulletForce
+	[SchemaMember("CCSPlayerPawn", "m_vecTotalBulletForce")]
+	public Vector TotalBulletForce => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawn", "m_vecTotalBulletForce");
+
+	// m_bWaitForNoAttack
+	[SchemaMember("CCSPlayerPawn", "m_bWaitForNoAttack")]
+	public ref bool WaitForNoAttack => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bWaitForNoAttack");
+
+	// m_ignoreLadderJumpTime
+	[SchemaMember("CCSPlayerPawn", "m_ignoreLadderJumpTime")]
+	public ref float IgnoreLadderJumpTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_ignoreLadderJumpTime");
+
+	// m_NumEnemiesKilledThisRound
+	[SchemaMember("CCSPlayerPawn", "m_NumEnemiesKilledThisRound")]
+	public ref Int32 NumEnemiesKilledThisRound => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_NumEnemiesKilledThisRound");
+
+	// m_bKilledByHeadshot
+	[SchemaMember("CCSPlayerPawn", "m_bKilledByHeadshot")]
+	public ref bool KilledByHeadshot => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bKilledByHeadshot");
+
+	// m_LastHitBox
+	[SchemaMember("CCSPlayerPawn", "m_LastHitBox")]
+	public ref Int32 LastHitBox => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_LastHitBox");
+
+	// m_LastHealth
+	[SchemaMember("CCSPlayerPawn", "m_LastHealth")]
+	public ref Int32 LastHealth => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_LastHealth");
+
+	// m_pBot
+	[SchemaMember("CCSPlayerPawn", "m_pBot")]
+	public CCSBot? Bot => Schema.GetPointer<CCSBot>(this.Handle, "CCSPlayerPawn", "m_pBot");
+
+	// m_bBotAllowActive
+	[SchemaMember("CCSPlayerPawn", "m_bBotAllowActive")]
+	public ref bool BotAllowActive => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bBotAllowActive");
+
+	// m_thirdPersonHeading
+	[SchemaMember("CCSPlayerPawn", "m_thirdPersonHeading")]
+	public QAngle ThirdPersonHeading => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawn", "m_thirdPersonHeading");
+
+	// m_flSlopeDropOffset
+	[SchemaMember("CCSPlayerPawn", "m_flSlopeDropOffset")]
+	public ref float SlopeDropOffset => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flSlopeDropOffset");
+
+	// m_flSlopeDropHeight
+	[SchemaMember("CCSPlayerPawn", "m_flSlopeDropHeight")]
+	public ref float SlopeDropHeight => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flSlopeDropHeight");
+
+	// m_vHeadConstraintOffset
+	[SchemaMember("CCSPlayerPawn", "m_vHeadConstraintOffset")]
+	public Vector HeadConstraintOffset => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawn", "m_vHeadConstraintOffset");
+
+	// m_nLastPickupPriority
+	[SchemaMember("CCSPlayerPawn", "m_nLastPickupPriority")]
+	public ref Int32 LastPickupPriority => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_nLastPickupPriority");
+
+	// m_flLastPickupPriorityTime
+	[SchemaMember("CCSPlayerPawn", "m_flLastPickupPriorityTime")]
+	public ref float LastPickupPriorityTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flLastPickupPriorityTime");
+
+	// m_ArmorValue
+	[SchemaMember("CCSPlayerPawn", "m_ArmorValue")]
+	public ref Int32 ArmorValue => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_ArmorValue");
+
+	// m_unCurrentEquipmentValue
+	[SchemaMember("CCSPlayerPawn", "m_unCurrentEquipmentValue")]
+	public ref UInt16 CurrentEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawn", "m_unCurrentEquipmentValue");
+
+	// m_unRoundStartEquipmentValue
+	[SchemaMember("CCSPlayerPawn", "m_unRoundStartEquipmentValue")]
+	public ref UInt16 RoundStartEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawn", "m_unRoundStartEquipmentValue");
+
+	// m_unFreezetimeEndEquipmentValue
+	[SchemaMember("CCSPlayerPawn", "m_unFreezetimeEndEquipmentValue")]
+	public ref UInt16 FreezetimeEndEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawn", "m_unFreezetimeEndEquipmentValue");
+
+	// m_iLastWeaponFireUsercmd
+	[SchemaMember("CCSPlayerPawn", "m_iLastWeaponFireUsercmd")]
+	public ref Int32 LastWeaponFireUsercmd => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_iLastWeaponFireUsercmd");
+
+	// m_flLastFriendlyFireDamageReductionRatio
+	[SchemaMember("CCSPlayerPawn", "m_flLastFriendlyFireDamageReductionRatio")]
+	public ref float LastFriendlyFireDamageReductionRatio => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flLastFriendlyFireDamageReductionRatio");
+
+	// m_bIsSpawning
+	[SchemaMember("CCSPlayerPawn", "m_bIsSpawning")]
+	public ref bool IsSpawning => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bIsSpawning");
+
+	// m_iDeathFlags
+	[SchemaMember("CCSPlayerPawn", "m_iDeathFlags")]
+	public ref Int32 DeathFlags => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawn", "m_iDeathFlags");
+
+	// m_bHasDeathInfo
+	[SchemaMember("CCSPlayerPawn", "m_bHasDeathInfo")]
+	public ref bool HasDeathInfo => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bHasDeathInfo");
+
+	// m_flDeathInfoTime
+	[SchemaMember("CCSPlayerPawn", "m_flDeathInfoTime")]
+	public ref float DeathInfoTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_flDeathInfoTime");
+
+	// m_vecDeathInfoOrigin
+	[SchemaMember("CCSPlayerPawn", "m_vecDeathInfoOrigin")]
+	public Vector DeathInfoOrigin => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawn", "m_vecDeathInfoOrigin");
+
+	// m_vecPlayerPatchEconIndices
+	[SchemaMember("CCSPlayerPawn", "m_vecPlayerPatchEconIndices")]
+	public Span<UInt32> PlayerPatchEconIndices => Schema.GetFixedArray<UInt32>(this.Handle, "CCSPlayerPawn", "m_vecPlayerPatchEconIndices", 5);
+
+	// m_GunGameImmunityColor
+	[SchemaMember("CCSPlayerPawn", "m_GunGameImmunityColor")]
+	public Color GunGameImmunityColor
+	{
+		get { return Schema.GetCustomMarshalledType<Color>(this.Handle, "CCSPlayerPawn", "m_GunGameImmunityColor"); }
+		set { Schema.SetCustomMarshalledType<Color>(this.Handle, "CCSPlayerPawn", "m_GunGameImmunityColor", value); }
+	}
+
+	// m_grenadeParameterStashTime
+	[SchemaMember("CCSPlayerPawn", "m_grenadeParameterStashTime")]
+	public ref float GrenadeParameterStashTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawn", "m_grenadeParameterStashTime");
+
+	// m_bGrenadeParametersStashed
+	[SchemaMember("CCSPlayerPawn", "m_bGrenadeParametersStashed")]
+	public ref bool GrenadeParametersStashed => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawn", "m_bGrenadeParametersStashed");
+
+	// m_angStashedShootAngles
+	[SchemaMember("CCSPlayerPawn", "m_angStashedShootAngles")]
+	public QAngle StashedShootAngles => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawn", "m_angStashedShootAngles");
+
+	// m_vecStashedGrenadeThrowPosition
+	[SchemaMember("CCSPlayerPawn", "m_vecStashedGrenadeThrowPosition")]
+	public Vector StashedGrenadeThrowPosition => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawn", "m_vecStashedGrenadeThrowPosition");
+
+	// m_vecStashedVelocity
+	[SchemaMember("CCSPlayerPawn", "m_vecStashedVelocity")]
+	public Vector StashedVelocity => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawn", "m_vecStashedVelocity");
+
+	// m_angShootAngleHistory
+	[SchemaMember("CCSPlayerPawn", "m_angShootAngleHistory")]
+	public Span<QAngle> ShootAngleHistory => Schema.GetFixedArray<QAngle>(this.Handle, "CCSPlayerPawn", "m_angShootAngleHistory", 2);
+
+	// m_vecThrowPositionHistory
+	[SchemaMember("CCSPlayerPawn", "m_vecThrowPositionHistory")]
+	public Span<Vector> ThrowPositionHistory => Schema.GetFixedArray<Vector>(this.Handle, "CCSPlayerPawn", "m_vecThrowPositionHistory", 2);
+
+	// m_vecVelocityHistory
+	[SchemaMember("CCSPlayerPawn", "m_vecVelocityHistory")]
+	public Span<Vector> VelocityHistory => Schema.GetFixedArray<Vector>(this.Handle, "CCSPlayerPawn", "m_vecVelocityHistory", 2);
+
 }

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayerPawnBase.g.cs

@@ -30,18 +30,6 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_pViewModelServices")]
 	public CPlayer_ViewModelServices? ViewModelServices => Schema.GetPointer<CPlayer_ViewModelServices>(this.Handle, "CCSPlayerPawnBase", "m_pViewModelServices");
 
-	// m_iDisplayHistoryBits
-	[SchemaMember("CCSPlayerPawnBase", "m_iDisplayHistoryBits")]
-	public ref UInt32 DisplayHistoryBits => ref Schema.GetRef<UInt32>(this.Handle, "CCSPlayerPawnBase", "m_iDisplayHistoryBits");
-
-	// m_flLastAttackedTeammate
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastAttackedTeammate")]
-	public ref float LastAttackedTeammate => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastAttackedTeammate");
-
-	// m_hOriginalController
-	[SchemaMember("CCSPlayerPawnBase", "m_hOriginalController")]
-	public CHandle<CCSPlayerController> OriginalController => Schema.GetDeclaredClass<CHandle<CCSPlayerController>>(this.Handle, "CCSPlayerPawnBase", "m_hOriginalController");
-
 	// m_blindUntilTime
 	[SchemaMember("CCSPlayerPawnBase", "m_blindUntilTime")]
 	public ref float BlindUntilTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_blindUntilTime");
@@ -50,82 +38,14 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_blindStartTime")]
 	public ref float BlindStartTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_blindStartTime");
 
-	// m_allowAutoFollowTime
-	[SchemaMember("CCSPlayerPawnBase", "m_allowAutoFollowTime")]
-	public ref float AllowAutoFollowTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_allowAutoFollowTime");
-
-	// m_entitySpottedState
-	[SchemaMember("CCSPlayerPawnBase", "m_entitySpottedState")]
-	public EntitySpottedState_t EntitySpottedState => Schema.GetDeclaredClass<EntitySpottedState_t>(this.Handle, "CCSPlayerPawnBase", "m_entitySpottedState");
-
-	// m_nSpotRules
-	[SchemaMember("CCSPlayerPawnBase", "m_nSpotRules")]
-	public ref Int32 SpotRules => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nSpotRules");
-
 	// m_iPlayerState
 	[SchemaMember("CCSPlayerPawnBase", "m_iPlayerState")]
 	public ref CSPlayerState PlayerState => ref Schema.GetRef<CSPlayerState>(this.Handle, "CCSPlayerPawnBase", "m_iPlayerState");
 
-	// m_chickenIdleSoundTimer
-	[SchemaMember("CCSPlayerPawnBase", "m_chickenIdleSoundTimer")]
-	public CountdownTimer ChickenIdleSoundTimer => Schema.GetDeclaredClass<CountdownTimer>(this.Handle, "CCSPlayerPawnBase", "m_chickenIdleSoundTimer");
-
-	// m_chickenJumpSoundTimer
-	[SchemaMember("CCSPlayerPawnBase", "m_chickenJumpSoundTimer")]
-	public CountdownTimer ChickenJumpSoundTimer => Schema.GetDeclaredClass<CountdownTimer>(this.Handle, "CCSPlayerPawnBase", "m_chickenJumpSoundTimer");
-
-	// m_vecLastBookmarkedPosition
-	[SchemaMember("CCSPlayerPawnBase", "m_vecLastBookmarkedPosition")]
-	public Vector LastBookmarkedPosition => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecLastBookmarkedPosition");
-
-	// m_flLastDistanceTraveledNotice
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastDistanceTraveledNotice")]
-	public ref float LastDistanceTraveledNotice => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastDistanceTraveledNotice");
-
-	// m_flAccumulatedDistanceTraveled
-	[SchemaMember("CCSPlayerPawnBase", "m_flAccumulatedDistanceTraveled")]
-	public ref float AccumulatedDistanceTraveled => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flAccumulatedDistanceTraveled");
-
-	// m_flLastFriendlyFireDamageReductionRatio
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastFriendlyFireDamageReductionRatio")]
-	public ref float LastFriendlyFireDamageReductionRatio => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastFriendlyFireDamageReductionRatio");
-
 	// m_bRespawning
 	[SchemaMember("CCSPlayerPawnBase", "m_bRespawning")]
 	public ref bool Respawning => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bRespawning");
 
-	// m_nLastPickupPriority
-	[SchemaMember("CCSPlayerPawnBase", "m_nLastPickupPriority")]
-	public ref Int32 LastPickupPriority => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nLastPickupPriority");
-
-	// m_flLastPickupPriorityTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastPickupPriorityTime")]
-	public ref float LastPickupPriorityTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastPickupPriorityTime");
-
-	// m_bIsScoped
-	[SchemaMember("CCSPlayerPawnBase", "m_bIsScoped")]
-	public ref bool IsScoped => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bIsScoped");
-
-	// m_bIsWalking
-	[SchemaMember("CCSPlayerPawnBase", "m_bIsWalking")]
-	public ref bool IsWalking => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bIsWalking");
-
-	// m_bResumeZoom
-	[SchemaMember("CCSPlayerPawnBase", "m_bResumeZoom")]
-	public ref bool ResumeZoom => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bResumeZoom");
-
-	// m_bIsDefusing
-	[SchemaMember("CCSPlayerPawnBase", "m_bIsDefusing")]
-	public ref bool IsDefusing => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bIsDefusing");
-
-	// m_bIsGrabbingHostage
-	[SchemaMember("CCSPlayerPawnBase", "m_bIsGrabbingHostage")]
-	public ref bool IsGrabbingHostage => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bIsGrabbingHostage");
-
-	// m_iBlockingUseActionInProgress
-	[SchemaMember("CCSPlayerPawnBase", "m_iBlockingUseActionInProgress")]
-	public ref CSPlayerBlockingUseAction_t BlockingUseActionInProgress => ref Schema.GetRef<CSPlayerBlockingUseAction_t>(this.Handle, "CCSPlayerPawnBase", "m_iBlockingUseActionInProgress");
-
 	// m_fImmuneToGunGameDamageTime
 	[SchemaMember("CCSPlayerPawnBase", "m_fImmuneToGunGameDamageTime")]
 	public ref float ImmuneToGunGameDamageTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fImmuneToGunGameDamageTime");
@@ -134,14 +54,6 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_bGunGameImmunity")]
 	public ref bool GunGameImmunity => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bGunGameImmunity");
 
-	// m_GunGameImmunityColor
-	[SchemaMember("CCSPlayerPawnBase", "m_GunGameImmunityColor")]
-	public Color GunGameImmunityColor
-	{
-		get { return Schema.GetCustomMarshalledType<Color>(this.Handle, "CCSPlayerPawnBase", "m_GunGameImmunityColor"); }
-		set { Schema.SetCustomMarshalledType<Color>(this.Handle, "CCSPlayerPawnBase", "m_GunGameImmunityColor", value); }
-	}
-
 	// m_fMolotovDamageTime
 	[SchemaMember("CCSPlayerPawnBase", "m_fMolotovDamageTime")]
 	public ref float MolotovDamageTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fMolotovDamageTime");
@@ -150,210 +62,18 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_bHasMovedSinceSpawn")]
 	public ref bool HasMovedSinceSpawn => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHasMovedSinceSpawn");
 
-	// m_bCanMoveDuringFreezePeriod
-	[SchemaMember("CCSPlayerPawnBase", "m_bCanMoveDuringFreezePeriod")]
-	public ref bool CanMoveDuringFreezePeriod => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bCanMoveDuringFreezePeriod");
-
-	// m_flGuardianTooFarDistFrac
-	[SchemaMember("CCSPlayerPawnBase", "m_flGuardianTooFarDistFrac")]
-	public ref float GuardianTooFarDistFrac => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flGuardianTooFarDistFrac");
-
-	// m_flNextGuardianTooFarHurtTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flNextGuardianTooFarHurtTime")]
-	public ref float NextGuardianTooFarHurtTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flNextGuardianTooFarHurtTime");
-
-	// m_flDetectedByEnemySensorTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flDetectedByEnemySensorTime")]
-	public ref float DetectedByEnemySensorTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flDetectedByEnemySensorTime");
-
-	// m_flDealtDamageToEnemyMostRecentTimestamp
-	[SchemaMember("CCSPlayerPawnBase", "m_flDealtDamageToEnemyMostRecentTimestamp")]
-	public ref float DealtDamageToEnemyMostRecentTimestamp => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flDealtDamageToEnemyMostRecentTimestamp");
-
-	// m_flLastEquippedHelmetTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastEquippedHelmetTime")]
-	public ref float LastEquippedHelmetTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastEquippedHelmetTime");
-
-	// m_flLastEquippedArmorTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastEquippedArmorTime")]
-	public ref float LastEquippedArmorTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastEquippedArmorTime");
-
-	// m_nHeavyAssaultSuitCooldownRemaining
-	[SchemaMember("CCSPlayerPawnBase", "m_nHeavyAssaultSuitCooldownRemaining")]
-	public ref Int32 HeavyAssaultSuitCooldownRemaining => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nHeavyAssaultSuitCooldownRemaining");
-
-	// m_bResetArmorNextSpawn
-	[SchemaMember("CCSPlayerPawnBase", "m_bResetArmorNextSpawn")]
-	public ref bool ResetArmorNextSpawn => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bResetArmorNextSpawn");
-
-	// m_flLastBumpMineBumpTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastBumpMineBumpTime")]
-	public ref float LastBumpMineBumpTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastBumpMineBumpTime");
-
-	// m_flEmitSoundTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flEmitSoundTime")]
-	public ref float EmitSoundTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flEmitSoundTime");
-
 	// m_iNumSpawns
 	[SchemaMember("CCSPlayerPawnBase", "m_iNumSpawns")]
 	public ref Int32 NumSpawns => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iNumSpawns");
 
-	// m_iShouldHaveCash
-	[SchemaMember("CCSPlayerPawnBase", "m_iShouldHaveCash")]
-	public ref Int32 ShouldHaveCash => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iShouldHaveCash");
-
-	// m_bInvalidSteamLogonDelayed
-	[SchemaMember("CCSPlayerPawnBase", "m_bInvalidSteamLogonDelayed")]
-	public ref bool InvalidSteamLogonDelayed => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bInvalidSteamLogonDelayed");
-
-	// m_flLastAction
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastAction")]
-	public ref float LastAction => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastAction");
-
-	// m_flNameChangeHistory
-	[SchemaMember("CCSPlayerPawnBase", "m_flNameChangeHistory")]
-	public Span<float> NameChangeHistory => Schema.GetFixedArray<float>(this.Handle, "CCSPlayerPawnBase", "m_flNameChangeHistory", 5);
-
-	// m_fLastGivenDefuserTime
-	[SchemaMember("CCSPlayerPawnBase", "m_fLastGivenDefuserTime")]
-	public ref float LastGivenDefuserTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fLastGivenDefuserTime");
-
-	// m_fLastGivenBombTime
-	[SchemaMember("CCSPlayerPawnBase", "m_fLastGivenBombTime")]
-	public ref float LastGivenBombTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fLastGivenBombTime");
-
-	// m_bHasNightVision
-	[SchemaMember("CCSPlayerPawnBase", "m_bHasNightVision")]
-	public ref bool HasNightVision => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHasNightVision");
-
-	// m_bNightVisionOn
-	[SchemaMember("CCSPlayerPawnBase", "m_bNightVisionOn")]
-	public ref bool NightVisionOn => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bNightVisionOn");
+	// m_flIdleTimeSinceLastAction
+	[SchemaMember("CCSPlayerPawnBase", "m_flIdleTimeSinceLastAction")]
+	public ref float IdleTimeSinceLastAction => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flIdleTimeSinceLastAction");
 
 	// m_fNextRadarUpdateTime
 	[SchemaMember("CCSPlayerPawnBase", "m_fNextRadarUpdateTime")]
 	public ref float NextRadarUpdateTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fNextRadarUpdateTime");
 
-	// m_flLastMoneyUpdateTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastMoneyUpdateTime")]
-	public ref float LastMoneyUpdateTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastMoneyUpdateTime");
-
-	// m_MenuStringBuffer
-	[SchemaMember("CCSPlayerPawnBase", "m_MenuStringBuffer")]
-	public string MenuStringBuffer
-	{
-		get { return Schema.GetString(this.Handle, "CCSPlayerPawnBase", "m_MenuStringBuffer"); }
-		set { Schema.SetStringBytes(this.Handle, "CCSPlayerPawnBase", "m_MenuStringBuffer", value, 1024); }
-	}
-
-	// m_fIntroCamTime
-	[SchemaMember("CCSPlayerPawnBase", "m_fIntroCamTime")]
-	public ref float IntroCamTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_fIntroCamTime");
-
-	// m_nMyCollisionGroup
-	[SchemaMember("CCSPlayerPawnBase", "m_nMyCollisionGroup")]
-	public ref Int32 MyCollisionGroup => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nMyCollisionGroup");
-
-	// m_bInNoDefuseArea
-	[SchemaMember("CCSPlayerPawnBase", "m_bInNoDefuseArea")]
-	public ref bool InNoDefuseArea => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bInNoDefuseArea");
-
-	// m_bKilledByTaser
-	[SchemaMember("CCSPlayerPawnBase", "m_bKilledByTaser")]
-	public ref bool KilledByTaser => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bKilledByTaser");
-
-	// m_iMoveState
-	[SchemaMember("CCSPlayerPawnBase", "m_iMoveState")]
-	public ref Int32 MoveState => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iMoveState");
-
-	// m_grenadeParameterStashTime
-	[SchemaMember("CCSPlayerPawnBase", "m_grenadeParameterStashTime")]
-	public ref float GrenadeParameterStashTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_grenadeParameterStashTime");
-
-	// m_bGrenadeParametersStashed
-	[SchemaMember("CCSPlayerPawnBase", "m_bGrenadeParametersStashed")]
-	public ref bool GrenadeParametersStashed => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bGrenadeParametersStashed");
-
-	// m_angStashedShootAngles
-	[SchemaMember("CCSPlayerPawnBase", "m_angStashedShootAngles")]
-	public QAngle StashedShootAngles => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_angStashedShootAngles");
-
-	// m_vecStashedGrenadeThrowPosition
-	[SchemaMember("CCSPlayerPawnBase", "m_vecStashedGrenadeThrowPosition")]
-	public Vector StashedGrenadeThrowPosition => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecStashedGrenadeThrowPosition");
-
-	// m_vecStashedVelocity
-	[SchemaMember("CCSPlayerPawnBase", "m_vecStashedVelocity")]
-	public Vector StashedVelocity => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecStashedVelocity");
-
-	// m_angShootAngleHistory
-	[SchemaMember("CCSPlayerPawnBase", "m_angShootAngleHistory")]
-	public Span<QAngle> ShootAngleHistory => Schema.GetFixedArray<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_angShootAngleHistory", 2);
-
-	// m_vecThrowPositionHistory
-	[SchemaMember("CCSPlayerPawnBase", "m_vecThrowPositionHistory")]
-	public Span<Vector> ThrowPositionHistory => Schema.GetFixedArray<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecThrowPositionHistory", 2);
-
-	// m_vecVelocityHistory
-	[SchemaMember("CCSPlayerPawnBase", "m_vecVelocityHistory")]
-	public Span<Vector> VelocityHistory => Schema.GetFixedArray<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecVelocityHistory", 2);
-
-	// m_bDiedAirborne
-	[SchemaMember("CCSPlayerPawnBase", "m_bDiedAirborne")]
-	public ref bool DiedAirborne => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bDiedAirborne");
-
-	// m_iBombSiteIndex
-	[SchemaMember("CCSPlayerPawnBase", "m_iBombSiteIndex")]
-	public CEntityIndex BombSiteIndex => Schema.GetDeclaredClass<CEntityIndex>(this.Handle, "CCSPlayerPawnBase", "m_iBombSiteIndex");
-
-	// m_nWhichBombZone
-	[SchemaMember("CCSPlayerPawnBase", "m_nWhichBombZone")]
-	public ref Int32 WhichBombZone => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nWhichBombZone");
-
-	// m_bInBombZoneTrigger
-	[SchemaMember("CCSPlayerPawnBase", "m_bInBombZoneTrigger")]
-	public ref bool InBombZoneTrigger => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bInBombZoneTrigger");
-
-	// m_bWasInBombZoneTrigger
-	[SchemaMember("CCSPlayerPawnBase", "m_bWasInBombZoneTrigger")]
-	public ref bool WasInBombZoneTrigger => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bWasInBombZoneTrigger");
-
-	// m_iDirection
-	[SchemaMember("CCSPlayerPawnBase", "m_iDirection")]
-	public ref Int32 Direction => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iDirection");
-
-	// m_iShotsFired
-	[SchemaMember("CCSPlayerPawnBase", "m_iShotsFired")]
-	public ref Int32 ShotsFired => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iShotsFired");
-
-	// m_ArmorValue
-	[SchemaMember("CCSPlayerPawnBase", "m_ArmorValue")]
-	public ref Int32 ArmorValue => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_ArmorValue");
-
-	// m_flFlinchStack
-	[SchemaMember("CCSPlayerPawnBase", "m_flFlinchStack")]
-	public ref float FlinchStack => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flFlinchStack");
-
-	// m_flVelocityModifier
-	[SchemaMember("CCSPlayerPawnBase", "m_flVelocityModifier")]
-	public ref float VelocityModifier => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flVelocityModifier");
-
-	// m_flHitHeading
-	[SchemaMember("CCSPlayerPawnBase", "m_flHitHeading")]
-	public ref float HitHeading => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flHitHeading");
-
-	// m_nHitBodyPart
-	[SchemaMember("CCSPlayerPawnBase", "m_nHitBodyPart")]
-	public ref Int32 HitBodyPart => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nHitBodyPart");
-
-	// m_iHostagesKilled
-	[SchemaMember("CCSPlayerPawnBase", "m_iHostagesKilled")]
-	public ref Int32 HostagesKilled => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iHostagesKilled");
-
-	// m_vecTotalBulletForce
-	[SchemaMember("CCSPlayerPawnBase", "m_vecTotalBulletForce")]
-	public Vector TotalBulletForce => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecTotalBulletForce");
-
 	// m_flFlashDuration
 	[SchemaMember("CCSPlayerPawnBase", "m_flFlashDuration")]
 	public ref float FlashDuration => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flFlashDuration");
@@ -370,86 +90,10 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_iProgressBarDuration")]
 	public ref Int32 ProgressBarDuration => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iProgressBarDuration");
 
-	// m_bWaitForNoAttack
-	[SchemaMember("CCSPlayerPawnBase", "m_bWaitForNoAttack")]
-	public ref bool WaitForNoAttack => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bWaitForNoAttack");
-
-	// m_flLowerBodyYawTarget
-	[SchemaMember("CCSPlayerPawnBase", "m_flLowerBodyYawTarget")]
-	public ref float LowerBodyYawTarget => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLowerBodyYawTarget");
-
-	// m_bStrafing
-	[SchemaMember("CCSPlayerPawnBase", "m_bStrafing")]
-	public ref bool Strafing => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bStrafing");
-
-	// m_lastStandingPos
-	[SchemaMember("CCSPlayerPawnBase", "m_lastStandingPos")]
-	public Vector LastStandingPos => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_lastStandingPos");
-
-	// m_ignoreLadderJumpTime
-	[SchemaMember("CCSPlayerPawnBase", "m_ignoreLadderJumpTime")]
-	public ref float IgnoreLadderJumpTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_ignoreLadderJumpTime");
-
-	// m_ladderSurpressionTimer
-	[SchemaMember("CCSPlayerPawnBase", "m_ladderSurpressionTimer")]
-	public CountdownTimer LadderSurpressionTimer => Schema.GetDeclaredClass<CountdownTimer>(this.Handle, "CCSPlayerPawnBase", "m_ladderSurpressionTimer");
-
-	// m_lastLadderNormal
-	[SchemaMember("CCSPlayerPawnBase", "m_lastLadderNormal")]
-	public Vector LastLadderNormal => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_lastLadderNormal");
-
-	// m_lastLadderPos
-	[SchemaMember("CCSPlayerPawnBase", "m_lastLadderPos")]
-	public Vector LastLadderPos => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_lastLadderPos");
-
-	// m_thirdPersonHeading
-	[SchemaMember("CCSPlayerPawnBase", "m_thirdPersonHeading")]
-	public QAngle ThirdPersonHeading => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_thirdPersonHeading");
-
-	// m_flSlopeDropOffset
-	[SchemaMember("CCSPlayerPawnBase", "m_flSlopeDropOffset")]
-	public ref float SlopeDropOffset => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flSlopeDropOffset");
-
-	// m_flSlopeDropHeight
-	[SchemaMember("CCSPlayerPawnBase", "m_flSlopeDropHeight")]
-	public ref float SlopeDropHeight => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flSlopeDropHeight");
-
-	// m_vHeadConstraintOffset
-	[SchemaMember("CCSPlayerPawnBase", "m_vHeadConstraintOffset")]
-	public Vector HeadConstraintOffset => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vHeadConstraintOffset");
-
-	// m_iLastWeaponFireUsercmd
-	[SchemaMember("CCSPlayerPawnBase", "m_iLastWeaponFireUsercmd")]
-	public ref Int32 LastWeaponFireUsercmd => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iLastWeaponFireUsercmd");
-
 	// m_angEyeAngles
 	[SchemaMember("CCSPlayerPawnBase", "m_angEyeAngles")]
 	public QAngle EyeAngles => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_angEyeAngles");
 
-	// m_bVCollisionInitted
-	[SchemaMember("CCSPlayerPawnBase", "m_bVCollisionInitted")]
-	public ref bool VCollisionInitted => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bVCollisionInitted");
-
-	// m_storedSpawnPosition
-	[SchemaMember("CCSPlayerPawnBase", "m_storedSpawnPosition")]
-	public Vector StoredSpawnPosition => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_storedSpawnPosition");
-
-	// m_storedSpawnAngle
-	[SchemaMember("CCSPlayerPawnBase", "m_storedSpawnAngle")]
-	public QAngle StoredSpawnAngle => Schema.GetDeclaredClass<QAngle>(this.Handle, "CCSPlayerPawnBase", "m_storedSpawnAngle");
-
-	// m_bIsSpawning
-	[SchemaMember("CCSPlayerPawnBase", "m_bIsSpawning")]
-	public ref bool IsSpawning => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bIsSpawning");
-
-	// m_bHideTargetID
-	[SchemaMember("CCSPlayerPawnBase", "m_bHideTargetID")]
-	public ref bool HideTargetID => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHideTargetID");
-
-	// m_nNumDangerZoneDamageHits
-	[SchemaMember("CCSPlayerPawnBase", "m_nNumDangerZoneDamageHits")]
-	public ref Int32 NumDangerZoneDamageHits => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nNumDangerZoneDamageHits");
-
 	// m_bHud_MiniScoreHidden
 	[SchemaMember("CCSPlayerPawnBase", "m_bHud_MiniScoreHidden")]
 	public ref bool Hud_MiniScoreHidden => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHud_MiniScoreHidden");
@@ -458,42 +102,6 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_bHud_RadarHidden")]
 	public ref bool Hud_RadarHidden => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHud_RadarHidden");
 
-	// m_nLastKillerIndex
-	[SchemaMember("CCSPlayerPawnBase", "m_nLastKillerIndex")]
-	public CEntityIndex LastKillerIndex => Schema.GetDeclaredClass<CEntityIndex>(this.Handle, "CCSPlayerPawnBase", "m_nLastKillerIndex");
-
-	// m_nLastConcurrentKilled
-	[SchemaMember("CCSPlayerPawnBase", "m_nLastConcurrentKilled")]
-	public ref Int32 LastConcurrentKilled => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nLastConcurrentKilled");
-
-	// m_nDeathCamMusic
-	[SchemaMember("CCSPlayerPawnBase", "m_nDeathCamMusic")]
-	public ref Int32 DeathCamMusic => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nDeathCamMusic");
-
-	// m_iAddonBits
-	[SchemaMember("CCSPlayerPawnBase", "m_iAddonBits")]
-	public ref Int32 AddonBits => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iAddonBits");
-
-	// m_iPrimaryAddon
-	[SchemaMember("CCSPlayerPawnBase", "m_iPrimaryAddon")]
-	public ref Int32 PrimaryAddon => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iPrimaryAddon");
-
-	// m_iSecondaryAddon
-	[SchemaMember("CCSPlayerPawnBase", "m_iSecondaryAddon")]
-	public ref Int32 SecondaryAddon => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iSecondaryAddon");
-
-	// m_currentDeafnessFilter
-	[SchemaMember("CCSPlayerPawnBase", "m_currentDeafnessFilter")]
-	public CUtlStringToken CurrentDeafnessFilter => Schema.GetDeclaredClass<CUtlStringToken>(this.Handle, "CCSPlayerPawnBase", "m_currentDeafnessFilter");
-
-	// m_NumEnemiesKilledThisSpawn
-	[SchemaMember("CCSPlayerPawnBase", "m_NumEnemiesKilledThisSpawn")]
-	public ref Int32 NumEnemiesKilledThisSpawn => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_NumEnemiesKilledThisSpawn");
-
-	// m_NumEnemiesKilledThisRound
-	[SchemaMember("CCSPlayerPawnBase", "m_NumEnemiesKilledThisRound")]
-	public ref Int32 NumEnemiesKilledThisRound => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_NumEnemiesKilledThisRound");
-
 	// m_NumEnemiesAtRoundStart
 	[SchemaMember("CCSPlayerPawnBase", "m_NumEnemiesAtRoundStart")]
 	public ref Int32 NumEnemiesAtRoundStart => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_NumEnemiesAtRoundStart");
@@ -502,76 +110,16 @@ public partial class CCSPlayerPawnBase : CBasePlayerPawn
 	[SchemaMember("CCSPlayerPawnBase", "m_wasNotKilledNaturally")]
 	public ref bool WasNotKilledNaturally => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_wasNotKilledNaturally");
 
-	// m_vecPlayerPatchEconIndices
-	[SchemaMember("CCSPlayerPawnBase", "m_vecPlayerPatchEconIndices")]
-	public Span<UInt32> PlayerPatchEconIndices => Schema.GetFixedArray<UInt32>(this.Handle, "CCSPlayerPawnBase", "m_vecPlayerPatchEconIndices", 5);
-
-	// m_iDeathFlags
-	[SchemaMember("CCSPlayerPawnBase", "m_iDeathFlags")]
-	public ref Int32 DeathFlags => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_iDeathFlags");
-
 	// m_hPet
 	[SchemaMember("CCSPlayerPawnBase", "m_hPet")]
 	public CHandle<CChicken> Pet => Schema.GetDeclaredClass<CHandle<CChicken>>(this.Handle, "CCSPlayerPawnBase", "m_hPet");
 
-	// m_unCurrentEquipmentValue
-	[SchemaMember("CCSPlayerPawnBase", "m_unCurrentEquipmentValue")]
-	public ref UInt16 CurrentEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawnBase", "m_unCurrentEquipmentValue");
-
-	// m_unRoundStartEquipmentValue
-	[SchemaMember("CCSPlayerPawnBase", "m_unRoundStartEquipmentValue")]
-	public ref UInt16 RoundStartEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawnBase", "m_unRoundStartEquipmentValue");
-
-	// m_unFreezetimeEndEquipmentValue
-	[SchemaMember("CCSPlayerPawnBase", "m_unFreezetimeEndEquipmentValue")]
-	public ref UInt16 FreezetimeEndEquipmentValue => ref Schema.GetRef<UInt16>(this.Handle, "CCSPlayerPawnBase", "m_unFreezetimeEndEquipmentValue");
-
-	// m_nSurvivalTeamNumber
-	[SchemaMember("CCSPlayerPawnBase", "m_nSurvivalTeamNumber")]
-	public ref Int32 SurvivalTeamNumber => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_nSurvivalTeamNumber");
-
-	// m_bHasDeathInfo
-	[SchemaMember("CCSPlayerPawnBase", "m_bHasDeathInfo")]
-	public ref bool HasDeathInfo => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bHasDeathInfo");
-
-	// m_flDeathInfoTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flDeathInfoTime")]
-	public ref float DeathInfoTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flDeathInfoTime");
-
-	// m_vecDeathInfoOrigin
-	[SchemaMember("CCSPlayerPawnBase", "m_vecDeathInfoOrigin")]
-	public Vector DeathInfoOrigin => Schema.GetDeclaredClass<Vector>(this.Handle, "CCSPlayerPawnBase", "m_vecDeathInfoOrigin");
-
-	// m_bKilledByHeadshot
-	[SchemaMember("CCSPlayerPawnBase", "m_bKilledByHeadshot")]
-	public ref bool KilledByHeadshot => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bKilledByHeadshot");
-
-	// m_LastHitBox
-	[SchemaMember("CCSPlayerPawnBase", "m_LastHitBox")]
-	public ref Int32 LastHitBox => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_LastHitBox");
-
-	// m_LastHealth
-	[SchemaMember("CCSPlayerPawnBase", "m_LastHealth")]
-	public ref Int32 LastHealth => ref Schema.GetRef<Int32>(this.Handle, "CCSPlayerPawnBase", "m_LastHealth");
-
-	// m_flLastCollisionCeiling
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastCollisionCeiling")]
-	public ref float LastCollisionCeiling => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastCollisionCeiling");
-
-	// m_flLastCollisionCeilingChangeTime
-	[SchemaMember("CCSPlayerPawnBase", "m_flLastCollisionCeilingChangeTime")]
-	public ref float LastCollisionCeilingChangeTime => ref Schema.GetRef<float>(this.Handle, "CCSPlayerPawnBase", "m_flLastCollisionCeilingChangeTime");
-
-	// m_pBot
-	[SchemaMember("CCSPlayerPawnBase", "m_pBot")]
-	public CCSBot? Bot => Schema.GetPointer<CCSBot>(this.Handle, "CCSPlayerPawnBase", "m_pBot");
-
-	// m_bBotAllowActive
-	[SchemaMember("CCSPlayerPawnBase", "m_bBotAllowActive")]
-	public ref bool BotAllowActive => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bBotAllowActive");
-
 	// m_bCommittingSuicideOnTeamChange
 	[SchemaMember("CCSPlayerPawnBase", "m_bCommittingSuicideOnTeamChange")]
 	public ref bool CommittingSuicideOnTeamChange => ref Schema.GetRef<bool>(this.Handle, "CCSPlayerPawnBase", "m_bCommittingSuicideOnTeamChange");
 
+	// m_hOriginalController
+	[SchemaMember("CCSPlayerPawnBase", "m_hOriginalController")]
+	public CHandle<CCSPlayerController> OriginalController => Schema.GetDeclaredClass<CHandle<CCSPlayerController>>(this.Handle, "CCSPlayerPawnBase", "m_hOriginalController");
+
 }

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayer_UseServices.g.cs

@@ -26,10 +26,6 @@ public partial class CCSPlayer_UseServices : CPlayer_UseServices
 	[SchemaMember("CCSPlayer_UseServices", "m_flLastUseTimeStamp")]
 	public ref float LastUseTimeStamp => ref Schema.GetRef<float>(this.Handle, "CCSPlayer_UseServices", "m_flLastUseTimeStamp");
 
-	// m_flTimeStartedHoldingUse
-	[SchemaMember("CCSPlayer_UseServices", "m_flTimeStartedHoldingUse")]
-	public ref float TimeStartedHoldingUse => ref Schema.GetRef<float>(this.Handle, "CCSPlayer_UseServices", "m_flTimeStartedHoldingUse");
-
 	// m_flTimeLastUsedWindow
 	[SchemaMember("CCSPlayer_UseServices", "m_flTimeLastUsedWindow")]
 	public ref float TimeLastUsedWindow => ref Schema.GetRef<float>(this.Handle, "CCSPlayer_UseServices", "m_flTimeLastUsedWindow");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSPlayer_WeaponServices.g.cs

@@ -66,6 +66,10 @@ public partial class CCSPlayer_WeaponServices : CPlayer_WeaponServices
 	[SchemaMember("CCSPlayer_WeaponServices", "m_bDisableAutoDeploy")]
 	public ref bool DisableAutoDeploy => ref Schema.GetRef<bool>(this.Handle, "CCSPlayer_WeaponServices", "m_bDisableAutoDeploy");
 
+	// m_bIsPickingUpGroundWeapon
+	[SchemaMember("CCSPlayer_WeaponServices", "m_bIsPickingUpGroundWeapon")]
+	public ref bool IsPickingUpGroundWeapon => ref Schema.GetRef<bool>(this.Handle, "CCSPlayer_WeaponServices", "m_bIsPickingUpGroundWeapon");
+
 	// m_nOldShootPositionHistoryCount
 	[SchemaMember("CCSPlayer_WeaponServices", "m_nOldShootPositionHistoryCount")]
 	public ref UInt32 OldShootPositionHistoryCount => ref Schema.GetRef<UInt32>(this.Handle, "CCSPlayer_WeaponServices", "m_nOldShootPositionHistoryCount");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CCSWeaponBase.g.cs

@@ -194,6 +194,14 @@ public partial class CCSWeaponBase : CBasePlayerWeapon
 	[SchemaMember("CCSWeaponBase", "m_iOriginalTeamNumber")]
 	public ref Int32 OriginalTeamNumber => ref Schema.GetRef<Int32>(this.Handle, "CCSWeaponBase", "m_iOriginalTeamNumber");
 
+	// m_iMostRecentTeamNumber
+	[SchemaMember("CCSWeaponBase", "m_iMostRecentTeamNumber")]
+	public ref Int32 MostRecentTeamNumber => ref Schema.GetRef<Int32>(this.Handle, "CCSWeaponBase", "m_iMostRecentTeamNumber");
+
+	// m_bDroppedNearBuyZone
+	[SchemaMember("CCSWeaponBase", "m_bDroppedNearBuyZone")]
+	public ref bool DroppedNearBuyZone => ref Schema.GetRef<bool>(this.Handle, "CCSWeaponBase", "m_bDroppedNearBuyZone");
+
 	// m_flNextAttackRenderTimeOffset
 	[SchemaMember("CCSWeaponBase", "m_flNextAttackRenderTimeOffset")]
 	public ref float NextAttackRenderTimeOffset => ref Schema.GetRef<float>(this.Handle, "CCSWeaponBase", "m_flNextAttackRenderTimeOffset");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CDamageRecord.g.cs

@@ -20,11 +20,11 @@ public partial class CDamageRecord : NativeObject
 
 	// m_PlayerDamager
 	[SchemaMember("CDamageRecord", "m_PlayerDamager")]
-	public CHandle<CCSPlayerPawnBase> PlayerDamager => Schema.GetDeclaredClass<CHandle<CCSPlayerPawnBase>>(this.Handle, "CDamageRecord", "m_PlayerDamager");
+	public CHandle<CCSPlayerPawn> PlayerDamager => Schema.GetDeclaredClass<CHandle<CCSPlayerPawn>>(this.Handle, "CDamageRecord", "m_PlayerDamager");
 
 	// m_PlayerRecipient
 	[SchemaMember("CDamageRecord", "m_PlayerRecipient")]
-	public CHandle<CCSPlayerPawnBase> PlayerRecipient => Schema.GetDeclaredClass<CHandle<CCSPlayerPawnBase>>(this.Handle, "CDamageRecord", "m_PlayerRecipient");
+	public CHandle<CCSPlayerPawn> PlayerRecipient => Schema.GetDeclaredClass<CHandle<CCSPlayerPawn>>(this.Handle, "CDamageRecord", "m_PlayerRecipient");
 
 	// m_hPlayerControllerDamager
 	[SchemaMember("CDamageRecord", "m_hPlayerControllerDamager")]

managed/CounterStrikeSharp.API/Core/Schema/Classes/CPlantedC4.g.cs

@@ -114,10 +114,6 @@ public partial class CPlantedC4 : CBaseAnimGraph
 	[SchemaMember("CPlantedC4", "m_flNextBotBeepTime")]
 	public ref float NextBotBeepTime => ref Schema.GetRef<float>(this.Handle, "CPlantedC4", "m_flNextBotBeepTime");
 
-	// m_bPlantedAfterPickup
-	[SchemaMember("CPlantedC4", "m_bPlantedAfterPickup")]
-	public ref bool PlantedAfterPickup => ref Schema.GetRef<bool>(this.Handle, "CPlantedC4", "m_bPlantedAfterPickup");
-
 	// m_angCatchUpToPlayerEye
 	[SchemaMember("CPlantedC4", "m_angCatchUpToPlayerEye")]
 	public QAngle CatchUpToPlayerEye => Schema.GetDeclaredClass<QAngle>(this.Handle, "CPlantedC4", "m_angCatchUpToPlayerEye");

managed/CounterStrikeSharp.API/Core/Schema/Classes/CWeaponTaser.g.cs

@@ -22,4 +22,8 @@ public partial class CWeaponTaser : CCSWeaponBaseGun
 	[SchemaMember("CWeaponTaser", "m_fFireTime")]
 	public ref float FireTime => ref Schema.GetRef<float>(this.Handle, "CWeaponTaser", "m_fFireTime");
 
+	// m_nLastAttackTick
+	[SchemaMember("CWeaponTaser", "m_nLastAttackTick")]
+	public ref Int32 LastAttackTick => ref Schema.GetRef<Int32>(this.Handle, "CWeaponTaser", "m_nLastAttackTick");
+
 }

managed/CounterStrikeSharp.API/Core/Schema/Enums/PulseValueType_t.g.cs

@@ -25,5 +25,6 @@ public enum PulseValueType_t : uint
 	PVAL_CURSOR_FLOW = 0xD,
 	PVAL_ANY = 0xE,
 	PVAL_SCHEMA_ENUM = 0xF,
-	PVAL_COUNT = 0x10,
+	PVAL_PANORAMA_PANEL_HANDLE = 0x10,
+	PVAL_COUNT = 0x11,
 }

managed/CounterStrikeSharp.API/Core/Schema/Enums/SoundFlags_t.g.cs

@@ -28,7 +28,7 @@ public enum SoundFlags_t : uint
 	SOUND_CONTEXT_DANGER_APPROACH = 0x2000000,
 	SOUND_CONTEXT_ALLIES_ONLY = 0x4000000,
 	SOUND_CONTEXT_PANIC_NPCS = 0x8000000,
-	ALL_CONTEXTS = 0xFFFFFFFF,
+	ALL_CONTEXTS = 0xFFF00000,
 	ALL_SCENTS = 0x0,
 	ALL_SOUNDS = 0xFFFFF,
 }

managed/CounterStrikeSharp.API/Core/Schema/Enums/WeaponSwitchReason_t.g.cs

@@ -11,4 +11,5 @@ public enum WeaponSwitchReason_t : uint
 	eDrawn = 0x0,
 	eEquipped = 0x1,
 	eUserInitiatedSwitchToLast = 0x2,
+	eUserInitiatedSwitchHands = 0x3,
 }

managed/CounterStrikeSharp.API/CounterStrikeSharp.API.csproj

@@ -1,63 +1,73 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
-    <EnablePackageValidation>true</EnablePackageValidation>
-    <NoWarn>$(NoWarn);CS1591;CP0003</NoWarn>
-    <Nullable>enable</Nullable>
-	<GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
-    <Authors>Roflmuffin</Authors>
-    <Description>Official server side runtime assembly for CounterStrikeSharp</Description>
-    <PackageProjectUrl>http://docs.cssharp.dev/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/roflmuffin/CounterStrikeSharp</RepositoryUrl>
-    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <!-- <GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile> -->
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApiCompatValidateAssemblies>true</ApiCompatValidateAssemblies>
-    <ApiCompatContractAssembly>.\ApiCompat\v151.dll</ApiCompatContractAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Modules\Commands\CommandInfo" />
-    <None Remove="Modules\Disabled\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.DotNet.ApiCompat.Task" Version="7.0.404" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Scrutor" Version="4.2.2" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Core\Schema\" />
-    <Folder Include="Modules\Errors" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Modules\Disabled\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Remove="Modules\Disabled\**" />
-  </ItemGroup>
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-<!--  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">-->
-<!--    <Exec Command="dotnet run &#45;&#45;project ../../tooling/CodeGen.Natives" />-->
-<!--  </Target>-->
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <EnableDynamicLoading>true</EnableDynamicLoading>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
+        <EnablePackageValidation>true</EnablePackageValidation>
+        <NoWarn>$(NoWarn);CS1591;CP0003</NoWarn>
+        <Nullable>enable</Nullable>
+        <Authors>Roflmuffin</Authors>
+        <Description>Official server side runtime assembly for CounterStrikeSharp</Description>
+        <PackageProjectUrl>http://docs.cssharp.dev/</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/roflmuffin/CounterStrikeSharp</RepositoryUrl>
+        <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <SourceControlInformationFeatureSupported>true</SourceControlInformationFeatureSupported>
+        <!-- <GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile> -->
+    </PropertyGroup>
+    <PropertyGroup>
+        <ApiCompatValidateAssemblies>true</ApiCompatValidateAssemblies>
+        <ApiCompatContractAssembly>.\ApiCompat\v202.dll</ApiCompatContractAssembly>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="Modules\Commands\CommandInfo"/>
+        <None Remove="Modules\Disabled\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0"/>
+        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
+        <PackageReference Include="Microsoft.DotNet.ApiCompat.Task" Version="8.0.203"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.3"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="Scrutor" Version="4.2.2"/>
+        <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0"/>
+        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
+        <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Folder Include="Core\Schema\"/>
+        <Folder Include="Modules\Errors"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="Modules\Disabled\**"/>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Remove="Modules\Disabled\**"/>
+    </ItemGroup>
+    <PropertyGroup/>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
+        <Exec
+                Command="git describe --long --always --exclude=* --abbrev=7"
+                ConsoleToMSBuild="True"
+                IgnoreExitCode="False"
+        >
+            <Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput"/>
+        </Exec>
+    </Target>
+
+    <!--  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">-->
+    <!--    <Exec Command="dotnet run &#45;&#45;project ../../tooling/CodeGen.Natives" />-->
+    <!--  </Target>-->
 </Project>

managed/CounterStrikeSharp.API/GlobalUsings.cs

@@ -1,5 +1,7 @@
 // Global using directives
 
 global using System;
+global using System.Linq;
 global using System.IO;
+global using System.Collections.Generic;
 global using CounterStrikeSharp.API.Core;

managed/CounterStrikeSharp.API/Modules/Admin/AdminPermissions.cs

@@ -132,7 +132,6 @@ namespace CounterStrikeSharp.API.Modules.Admin
                 foreach (var adminDef in adminsFromFile.Values)
                 {
                     adminDef.InitalizeFlags();
-                    Console.WriteLine($"Domains: {adminDef.Flags.Count}");
 
                     if (SteamID.TryParse(adminDef.Identity, out var steamId))
                     {

managed/CounterStrikeSharp.API/Modules/Commands/CommandInfo.cs

@@ -23,6 +23,10 @@ namespace CounterStrikeSharp.API.Modules.Commands
     {
         public delegate void CommandCallback(CCSPlayerController? player, CommandInfo commandInfo);
         
+        /// <summary>
+        /// Command listener callback.
+        /// <returns>If returning <see cref="HookResult.Handled"/> or higher, will prevent the command from executing.</returns>
+        /// </summary>
         public delegate HookResult CommandListenerCallback(CCSPlayerController? player, CommandInfo commandInfo);
 
         public CCSPlayerController? CallingPlayer { get; }

managed/CounterStrikeSharp.API/Modules/Commands/Targeting/Target.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Frozen;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using CounterStrikeSharp.API.Modules.Entities;
@@ -12,7 +13,7 @@ public class Target
     private string Raw { get; }
     private string Slug { get; }
     
-    private static readonly Dictionary<string, TargetType> TargetTypeMap = new(StringComparer.OrdinalIgnoreCase)
+    public static readonly IReadOnlyDictionary<string, TargetType> TargetTypeMap = new Dictionary<string, TargetType>(StringComparer.OrdinalIgnoreCase)
     {
         { "@all", TargetType.GroupAll },
         { "@bots", TargetType.GroupBots },
@@ -24,7 +25,7 @@ public class Target
         { "@ct", TargetType.TeamCt },
         { "@t", TargetType.TeamT },
         { "@spec", TargetType.TeamSpec }
-    };
+    }.ToFrozenDictionary();
 
 
     private static bool ConstTargetType(string target, out TargetType targetType)

managed/CounterStrikeSharp.API/Modules/Entities/Constants/CollisionGroup.cs

@@ -18,34 +18,37 @@ namespace CounterStrikeSharp.API.Modules.Entities.Constants
 {
     public enum CollisionGroup
     {
-		COLLISION_GROUP_NONE  = 0,
-        COLLISION_GROUP_DEBRIS,			// Collides with nothing but world and static stuff
-        COLLISION_GROUP_DEBRIS_TRIGGER, // Same as debris, but hits triggers
-        COLLISION_GROUP_INTERACTIVE_DEBRIS,	// Collides with everything except other interactive debris or debris
-        COLLISION_GROUP_INTERACTIVE,	// Collides with everything except interactive debris or debris
+        COLLISION_GROUP_NONE = 0,
+        COLLISION_GROUP_NEVER,
+        COLLISION_GROUP_TRIGGER,
+        COLLISION_GROUP_CONDITIONALLY_SOLID,
+        COLLISION_GROUP_DEFAULT,
+        COLLISION_GROUP_DEBRIS, // Collides with nothing but world and static stuff
+        COLLISION_GROUP_INTERACTIVE_DEBRIS, // Collides with everything except other interactive debris or debris
+        COLLISION_GROUP_INTERACTIVE, // Collides with everything except interactive debris or debris
         COLLISION_GROUP_PLAYER,
         COLLISION_GROUP_BREAKABLE_GLASS,
         COLLISION_GROUP_VEHICLE,
-        COLLISION_GROUP_PLAYER_MOVEMENT,  // For HL2, same as Collision_Group_Player, for
-        // TF2, this filters out other players and CBaseObjects
-        COLLISION_GROUP_NPC,			// Generic NPC group
-        COLLISION_GROUP_IN_VEHICLE,		// for any entity inside a vehicle
-        COLLISION_GROUP_WEAPON,			// for any weapons that need collision detection
-        COLLISION_GROUP_VEHICLE_CLIP,	// vehicle clip brush to restrict vehicle movement
-        COLLISION_GROUP_PROJECTILE,		// Projectiles!
-        COLLISION_GROUP_DOOR_BLOCKER,	// Blocks entities not permitted to get near moving doors
-        COLLISION_GROUP_PASSABLE_DOOR,	// Doors that the player shouldn't collide with
-        COLLISION_GROUP_DISSOLVING,		// Things that are dissolving are in this group
-        COLLISION_GROUP_PUSHAWAY,		// Nonsolid on client and server, pushaway in player code
+        COLLISION_GROUP_PLAYER_MOVEMENT, // For HL2, same as Collision_Group_Player, for
 
-        COLLISION_GROUP_NPC_ACTOR,		// Used so NPCs in scripts ignore the player.
-        COLLISION_GROUP_NPC_SCRIPTED,	// USed for NPCs in scripts that should not collide with each other
+        // TF2, this filters out other players and CBaseObjects
+        COLLISION_GROUP_NPC, // Generic NPC group
+        COLLISION_GROUP_IN_VEHICLE, // for any entity inside a vehicle
+        COLLISION_GROUP_WEAPON, // for any weapons that need collision detection
+        COLLISION_GROUP_VEHICLE_CLIP, // vehicle clip brush to restrict vehicle movement
+        COLLISION_GROUP_PROJECTILE, // Projectiles!
+        COLLISION_GROUP_DOOR_BLOCKER, // Blocks entities not permitted to get near moving doors
+        COLLISION_GROUP_PASSABLE_DOOR, // Doors that the player shouldn't collide with
+        COLLISION_GROUP_DISSOLVING, // Things that are dissolving are in this group
+        COLLISION_GROUP_PUSHAWAY, // Nonsolid on client and server, pushaway in player code
+
+        COLLISION_GROUP_NPC_ACTOR, // Used so NPCs in scripts ignore the player.
+        COLLISION_GROUP_NPC_SCRIPTED, // USed for NPCs in scripts that should not collide with each other
         COLLISION_GROUP_PZ_CLIP,
 
 
-
-        COLLISION_GROUP_DEBRIS_BLOCK_PROJECTILE, // Only collides with bullets
+        COLLISION_GROUP_PROPS,
 
         LAST_SHARED_COLLISION_GROUP
-	}
+    }
 }

managed/CounterStrikeSharp.API/Modules/Events/GameEvent.cs

@@ -32,14 +32,18 @@ namespace CounterStrikeSharp.API.Modules.Events
 
     public class GameEvent : NativeObject
     {
+        // Used to track freeable state for manually created events.
+        private bool _freeable = false;
+
         public GameEvent(IntPtr pointer) : base(pointer)
         {
         }
-        
+
         public GameEvent(string name, bool force) : this(NativeAPI.CreateEvent(name, force))
         {
+            _freeable = true;
         }
-        
+
         public string EventName => NativeAPI.GetEventName(Handle);
 
         public T Get<T>(string name)
@@ -54,7 +58,9 @@ namespace CounterStrikeSharp.API.Modules.Events
                 _ when type == typeof(bool) => GetBool(name),
                 _ when type == typeof(ulong) => GetUint64(name),
                 _ when type == typeof(long) => (long)GetUint64(name),
-                _ when type == typeof(CCSPlayerController) => GetPlayer(name),
+                // This is a special case for player controllers as this method previously did not allow for nullable returns.
+                // So we return an invalid player controller if the player is not found.
+                _ when type == typeof(CCSPlayerController) => GetPlayer(name) ?? new CCSPlayerController(0),
                 _ => throw new NotSupportedException(),
             };
 
@@ -76,7 +82,7 @@ namespace CounterStrikeSharp.API.Modules.Events
                     SetInt(name, i);
                     break;
                 case var _ when value is CCSPlayerController player:
-                    NativeAPI.SetEventPlayerController(Handle, name, player.Handle);
+                    SetPlayer(name, player);
                     break;
                 case var _ when value is string s:
                     SetString(name, s);
@@ -100,9 +106,15 @@ namespace CounterStrikeSharp.API.Modules.Events
         protected string GetString(string name) => NativeAPI.GetEventString(Handle, name);
         protected int GetInt(string name) => NativeAPI.GetEventInt(Handle, name);
 
-        protected CCSPlayerController GetPlayer(string name)
+        protected CCSPlayerController? GetPlayer(string name)
         {
-            return new CCSPlayerController(NativeAPI.GetEventPlayerController(Handle, name));
+            var ptr = NativeAPI.GetEventPlayerController(Handle, name);
+            if (ptr == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            return new CCSPlayerController(ptr);
         }
 
         protected ulong GetUint64(string name) => NativeAPI.GetEventUint64(Handle, name);
@@ -121,8 +133,30 @@ namespace CounterStrikeSharp.API.Modules.Events
 
         protected void SetEntityIndex(string name, int value) => NativeAPI.SetEventEntityIndex(Handle, name, value);
 
-        public void FireEvent(bool dontBroadcast) => NativeAPI.FireEvent(Handle, dontBroadcast);
-        
+        protected void SetPlayer(string name, CCSPlayerController? player) => NativeAPI.SetEventPlayerController(Handle, name, player?.Handle ?? IntPtr.Zero);
+
+        public void FireEvent(bool dontBroadcast)
+        {
+            NativeAPI.FireEvent(Handle, dontBroadcast);
+            _freeable = false;
+        }
+
         public void FireEventToClient(CCSPlayerController player) => NativeAPI.FireEventToClient(Handle, (int)player.Index);
+
+        /// <summary>
+        /// Used to manually free the event.
+        /// <remarks>If <see cref="FireEvent"/> is called, Free will be called automatically.</remarks>
+        /// </summary>
+        public void Free()
+        {
+            if (!_freeable)
+            {
+                throw new InvalidOperationException("Event is not able to be freed.");
+            }
+
+            NativeAPI.FreeEvent(Handle);
+
+            _freeable = false;
+        }
     }
-}
+}

managed/CounterStrikeSharp.API/Modules/Memory/DynamicFunctions/DynamicHook.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using CounterStrikeSharp.API.Core;
 
 namespace CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
@@ -14,7 +14,13 @@ public class DynamicHook : NativeObject
         return NativeAPI.DynamicHookGetParam<T>(Handle, (int)typeof(T).ToValidDataType(), index);
     }
 
+    [Obsolete("Use GetReturn<T>() instead")]
     public T GetReturn<T>(int index)
+    {
+        return GetReturn<T>();
+    }
+    
+    public T GetReturn<T>()
     {
         return NativeAPI.DynamicHookGetReturn<T>(Handle, (int)typeof(T).ToValidDataType());
     }
@@ -28,4 +34,4 @@ public class DynamicHook : NativeObject
     {
         NativeAPI.DynamicHookSetReturn(Handle, (int)typeof(T).ToValidDataType(), value);
     }
-}
+}

managed/CounterStrikeSharp.API/Modules/Memory/VirtualFunctions.cs

@@ -46,10 +46,10 @@ public static class VirtualFunctions
 
     public static Action<IntPtr, string> SetModel = SetModelFunc.Invoke;
 
-    public static MemoryFunctionVoid<nint, RoundEndReason, float> TerminateRoundFunc =
+    public static MemoryFunctionVoid<nint, RoundEndReason, float, nint, byte> TerminateRoundFunc =
         new(GameData.GetSignature("CCSGameRules_TerminateRound"));
 
-    public static Action<IntPtr, RoundEndReason, float> TerminateRound = TerminateRoundFunc.Invoke;
+    public static Action<IntPtr, RoundEndReason, float, nint, byte> TerminateRound = TerminateRoundFunc.Invoke;
 
     public static MemoryFunctionWithReturn<string, int, IntPtr> UTIL_CreateEntityByNameFunc =
         new(GameData.GetSignature("UTIL_CreateEntityByName"));
@@ -81,15 +81,12 @@ public static class VirtualFunctions
     public static MemoryFunctionVoid<IntPtr, IntPtr>  RemovePlayerItemFunc =
         new(GameData.GetSignature("CBasePlayerPawn_RemovePlayerItem"));
     public static Action<IntPtr, IntPtr> RemovePlayerItemVirtual = RemovePlayerItemFunc.Invoke;
-    
-    public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, string, int> AcceptInputFunc = new(GameData.GetSignature("CEntityInstance_AcceptInput"));
-    public static Action<IntPtr, string, IntPtr, IntPtr, string, int> AcceptInput = AcceptInputFunc.Invoke;
 
     public static MemoryFunctionVoid<IntPtr, IntPtr, int, short, short> StateChangedFunc =
         new(GameData.GetSignature("StateChanged"));
     public static Action<IntPtr, IntPtr, int, short, short> StateChanged = StateChangedFunc.Invoke;
 
-    public static MemoryFunctionVoid<IntPtr, int, long> NetworkStateChangedFunc = new("NetworkStateChanged");
+    public static MemoryFunctionVoid<IntPtr, int, long> NetworkStateChangedFunc = new(GameData.GetSignature("NetworkStateChanged"));
     public static Action<IntPtr, int, long> NetworkStateChanged = NetworkStateChangedFunc.Invoke;
 
-}
+}

managed/CounterStrikeSharp.API/Modules/Menu/BaseMenu.cs

@@ -28,22 +28,35 @@ public enum PostSelectAction
 public abstract class BaseMenu : IMenu
 {
     public string Title { get; set; }
+
     public List<ChatMenuOption> MenuOptions { get; } = new();
     public PostSelectAction PostSelectAction { get; set; } = PostSelectAction.Reset;
-     
+    public bool ExitButton { get; set; } = true;
+
     protected BaseMenu(string title)
     {
         Title = title;
     }
-        
-    public virtual ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false)
+
+    public virtual ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect,
+        bool disabled = false)
     {
         var option = new ChatMenuOption(display, disabled, onSelect);
         MenuOptions.Add(option);
         return option;
     }
+
+    public abstract void Open(CCSPlayerController player);
+
+    public void OpenToAll()
+    {
+        foreach (var player in Utilities.GetPlayers())
+        {
+            Open(player);
+        }
+    }
 }
-    
+
 // This must be called ChatMenuOption to maintain backwards compatibility with the old API
 public class ChatMenuOption
 {
@@ -76,8 +89,8 @@ public abstract class BaseMenuInstance : IMenuInstance
     }
 
     protected bool HasPrevButton => Page > 0;
-    protected bool HasNextButton => CurrentOffset + NumPerPage < Menu.MenuOptions.Count;
-    protected int MenuItemsPerPage => NumPerPage + 2 - (HasNextButton ? 1 : 0) - (HasPrevButton ? 1 : 0);
+    protected bool HasNextButton => Menu.MenuOptions.Count > NumPerPage && CurrentOffset + NumPerPage < Menu.MenuOptions.Count;
+    protected virtual int MenuItemsPerPage => NumPerPage;
 
     public virtual void Display()
     {
@@ -113,7 +126,7 @@ public abstract class BaseMenuInstance : IMenuInstance
         if (menuItemIndex >= 0 && menuItemIndex < Menu.MenuOptions.Count)
         {
             var menuOption = Menu.MenuOptions[menuItemIndex];
-                
+
             if (!menuOption.Disabled)
             {
                 menuOption.OnSelect(Player, menuOption);
@@ -141,8 +154,8 @@ public abstract class BaseMenuInstance : IMenuInstance
         Page = 0;
         PrevPageOffsets.Clear();
     }
-        
-    public void Close()
+
+    public virtual void Close()
     {
         MenuManager.CloseActiveMenu(Player);
     }

managed/CounterStrikeSharp.API/Modules/Menu/CenterHtmlMenu.cs

@@ -21,17 +21,43 @@ namespace CounterStrikeSharp.API.Modules.Menu;
 
 public class CenterHtmlMenu : BaseMenu
 {
+    private readonly BasePlugin? _plugin;
+    public string TitleColor { get; set; } = "yellow";
+    public string EnabledColor { get; set; } = "green";
+    public string DisabledColor { get; set; } = "grey";
+    public string PrevPageColor { get; set; } = "yellow";
+    public string NextPageColor { get; set; } = "yellow";
+    public string CloseColor { get; set; } = "red";
+
+    public CenterHtmlMenu(string title, BasePlugin plugin) : base(ModifyTitle(title))
+    {
+        _plugin = plugin;
+    }
+    
+    [Obsolete("Use the constructor that takes a BasePlugin")]
     public CenterHtmlMenu(string title) : base(ModifyTitle(title))
     {
     }
+
+    public override void Open(CCSPlayerController player)
+    {
+        if (_plugin == null)
+        {
+            throw new InvalidOperationException("This method is unsupported with the CenterHtmlMenu constructor used." +
+                                                "Please provide a BasePlugin in the constructor.");
+        }; 
         
-    public override ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false)
+        MenuManager.OpenCenterHtmlMenu(_plugin, player, this);
+    }
+
+    public override ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect,
+        bool disabled = false)
     {
         var option = new ChatMenuOption(ModifyOptionDisplay(display), disabled, onSelect);
         MenuOptions.Add(option);
         return option;
     }
-        
+
     private static string ModifyTitle(string title)
     {
         if (title.Length > 32)
@@ -59,14 +85,15 @@ public class CenterHtmlMenuInstance : BaseMenuInstance
 {
     private readonly BasePlugin _plugin;
     public override int NumPerPage => 5; // one less than the actual number of items per page to avoid truncated options
-        
+    protected override int MenuItemsPerPage => (Menu.ExitButton ? 0 : 1) + ((HasPrevButton && HasNextButton) ? NumPerPage - 1 : NumPerPage);
+
     public CenterHtmlMenuInstance(BasePlugin plugin, CCSPlayerController player, IMenu menu) : base(player, menu)
     {
         _plugin = plugin;
         RemoveOnTickListener();
         plugin.RegisterListener<Core.Listeners.OnTick>(Display);
     }
-        
+
     public override void Display()
     {
         if (MenuManager.GetActiveMenu(Player) != this)
@@ -74,45 +101,53 @@ public class CenterHtmlMenuInstance : BaseMenuInstance
             Reset();
             return;
         }
-            
+
+        if (Menu is not CenterHtmlMenu centerHtmlMenu)
+        {
+            return;
+        }
+
         var builder = new StringBuilder();
-        builder.Append($"<b><font color='yellow'>{Menu.Title}</font></b>");
+        builder.Append($"<b><font color='{centerHtmlMenu.TitleColor}'>{centerHtmlMenu.Title}</font></b>");
         builder.AppendLine("<br>");
 
         var keyOffset = 1;
 
-        for (var i = CurrentOffset; i < Math.Min(CurrentOffset + MenuItemsPerPage, Menu.MenuOptions.Count); i++)
+        for (var i = CurrentOffset; i < Math.Min(CurrentOffset + MenuItemsPerPage, centerHtmlMenu.MenuOptions.Count); i++)
         {
-            var option = Menu.MenuOptions[i];
-            string color = option.Disabled ? "grey" : "green";
+            var option = centerHtmlMenu.MenuOptions[i];
+            string color = option.Disabled ? centerHtmlMenu.DisabledColor : centerHtmlMenu.EnabledColor;
             builder.Append($"<font color='{color}'>!{keyOffset++}</font> {option.Text}");
             builder.AppendLine("<br>");
         }
-            
+
         if (HasPrevButton)
         {
-            builder.AppendFormat("<font color='yellow'>!7</font> &#60;- Prev");
+            builder.AppendFormat($"<font color='{centerHtmlMenu.PrevPageColor}'>!7</font> &#60;- Prev");
             builder.AppendLine("<br>");
         }
 
         if (HasNextButton)
         {
-            builder.AppendFormat("<font color='yellow'>!8</font> -> Next");
+            builder.AppendFormat($"<font color='{centerHtmlMenu.NextPageColor}'>!8</font> -> Next");
             builder.AppendLine("<br>");
         }
 
-        builder.AppendFormat("<font color='red'>!9</font> -> Close");
-        builder.AppendLine("<br>");
+        if (centerHtmlMenu.ExitButton)
+        {
+            builder.AppendFormat($"<font color='{centerHtmlMenu.CloseColor}'>!9</font> -> Close");
+            builder.AppendLine("<br>");
+        }
 
         var currentPageText = builder.ToString();
         Player.PrintToCenterHtml(currentPageText);
     }
 
-    public override void Reset()
+    public override void Close()
     {
-        base.Reset();
+        base.Close();
         RemoveOnTickListener();
-            
+
         // Send a blank message to clear the menu
         Player.PrintToCenterHtml(" ");
     }

managed/CounterStrikeSharp.API/Modules/Menu/ChatMenu.cs

@@ -18,10 +18,22 @@ using CounterStrikeSharp.API.Modules.Utils;
 
 namespace CounterStrikeSharp.API.Modules.Menu;
 
-public class ChatMenu: BaseMenu
+public class ChatMenu : BaseMenu
 {
+    public char TitleColor { get; set; } = ChatColors.Yellow;
+    public char EnabledColor { get; set; } = ChatColors.Green;
+    public char DisabledColor { get; set; } = ChatColors.Grey;
+    public char PrevPageColor { get; set; } = ChatColors.Yellow;
+    public char NextPageColor { get; set; } = ChatColors.Yellow;
+    public char CloseColor { get; set; } = ChatColors.Red;
     public ChatMenu(string title) : base(title)
     {
+        ExitButton = false;
+    }
+    
+    public override void Open(CCSPlayerController player)
+    {
+        MenuManager.OpenChatMenu(player, this);
     }
 }
 
@@ -33,29 +45,35 @@ public class ChatMenuInstance : BaseMenuInstance
 
     public override void Display()
     {
-        Player.PrintToChat(Menu.Title);
+        if (Menu is not ChatMenu chatMenu)
+        {
+            return;
+        }
+
+        Player.PrintToChat($" {chatMenu.TitleColor} {chatMenu.Title}");
         Player.PrintToChat("---");
 
         var keyOffset = 1;
-
-        for (var i = CurrentOffset;
-             i < Math.Min(CurrentOffset + MenuItemsPerPage, Menu.MenuOptions.Count);
-             i++)
+        for (var i = CurrentOffset; i < Math.Min(CurrentOffset + MenuItemsPerPage, Menu.MenuOptions.Count); i++)
         {
             var option = Menu.MenuOptions[i];
-
-            Player.PrintToChat(
-                $" {(option.Disabled ? ChatColors.Grey : ChatColors.Green)} !{keyOffset++} {ChatColors.Default}{option.Text}");
+            char color = option.Disabled ? chatMenu.DisabledColor : chatMenu.EnabledColor;
+            Player.PrintToChat($" {color} !{keyOffset++} {ChatColors.Default}{option.Text}");
         }
 
         if (HasPrevButton)
         {
-            Player.PrintToChat($" {ChatColors.Yellow}!7 {ChatColors.Default}-> Prev");
+            Player.PrintToChat($" {chatMenu.PrevPageColor}!7 {ChatColors.Default}-> Prev");
         }
             
         if (HasNextButton)
         {
-            Player.PrintToChat($" {ChatColors.Yellow}!8 {ChatColors.Default}-> Next");
+            Player.PrintToChat($" {chatMenu.NextPageColor}!8 {ChatColors.Default}-> Next");
+        }
+
+        if (Menu.ExitButton)
+        {
+            Player.PrintToChat($" {chatMenu.CloseColor}!9 {ChatColors.Default}-> Close");
         }
     }
 }

managed/CounterStrikeSharp.API/Modules/Menu/ConsoleMenu.cs

@@ -21,6 +21,11 @@ public class ConsoleMenu : BaseMenu
     public ConsoleMenu(string title) : base(title)
     {
     }
+
+    public override void Open(CCSPlayerController player)
+    {
+        MenuManager.OpenConsoleMenu(player, this);
+    }
 }
 
 public class ConsoleMenuInstance : BaseMenuInstance
@@ -42,7 +47,7 @@ public class ConsoleMenuInstance : BaseMenuInstance
         {
             var option = Menu.MenuOptions[i];
 
-            Player.PrintToConsole($"{(option.Disabled ? "[Enabled]" : "[Disabled] - ")} css_{keyOffset++} {option.Text}");
+            Player.PrintToConsole($"{(option.Disabled ? "[Disabled] - " : "[Enabled]")} css_{keyOffset++} {option.Text}");
         }
             
         if (HasPrevButton)
@@ -54,5 +59,10 @@ public class ConsoleMenuInstance : BaseMenuInstance
         {
             Player.PrintToConsole("css_8 -> Next");
         }
+        
+        if (Menu.ExitButton)
+        {
+            Player.PrintToConsole("css_9 -> Close");
+        }
     }
 }

managed/CounterStrikeSharp.API/Modules/Menu/IMenu.cs

@@ -20,15 +20,18 @@ namespace CounterStrikeSharp.API.Modules.Menu;
 
 public interface IMenu
 {
-    public string Title { get; set; }
-    public List<ChatMenuOption> MenuOptions { get; }
-    public PostSelectAction PostSelectAction
+    string Title { get; set; }
+    List<ChatMenuOption> MenuOptions { get; }
+    PostSelectAction PostSelectAction
     {
         get { throw new NotImplementedException(); }
         set { throw new NotImplementedException(); }
     }
+    bool ExitButton { get; set; }
         
-    public ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false);
+    ChatMenuOption AddMenuOption(string display, Action<CCSPlayerController, ChatMenuOption> onSelect, bool disabled = false);
+    void Open(CCSPlayerController player);
+    void OpenToAll();
 }
 
 public interface IMenuInstance

managed/CounterStrikeSharp.API/Modules/Menu/MenuManager.cs

@@ -41,7 +41,7 @@ public static class MenuManager
 
         ActiveMenus.Remove(player.Handle);
     }
-
+    
     public static void OpenChatMenu(CCSPlayerController player, ChatMenu menu)
     {
         CloseActiveMenu(player);
@@ -49,7 +49,7 @@ public static class MenuManager
         ActiveMenus[player.Handle] = new ChatMenuInstance(player, menu);
         ActiveMenus[player.Handle].Display();
     }
-
+    
     public static void OpenCenterHtmlMenu(BasePlugin plugin, CCSPlayerController player, CenterHtmlMenu menu)
     {
         CloseActiveMenu(player);
@@ -57,7 +57,7 @@ public static class MenuManager
         ActiveMenus[player.Handle] = new CenterHtmlMenuInstance(plugin, player, menu);
         ActiveMenus[player.Handle].Display();
     }
-
+    
     public static void OpenConsoleMenu(CCSPlayerController player, ConsoleMenu menu)
     {
         CloseActiveMenu(player);

managed/CounterStrikeSharp.API/Modules/Utils/Angle.cs

@@ -14,9 +14,6 @@
  *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
  */
 
-using System;
-using CounterStrikeSharp.API.Core;
-
 namespace CounterStrikeSharp.API.Modules.Utils
 {
     /// <summary>
@@ -30,6 +27,8 @@ namespace CounterStrikeSharp.API.Modules.Utils
     /// </summary>
     public class Angle : NativeObject
     {
+        public static readonly Angle Zero = new();
+        
         public Angle(IntPtr pointer) : base(pointer)
         {
         }
@@ -46,8 +45,6 @@ namespace CounterStrikeSharp.API.Modules.Utils
             this.Y = y ?? 0;
             this.Z = z ?? 0;
         }
-        
-        
 
         #region Accessors
 
@@ -366,15 +363,15 @@ namespace CounterStrikeSharp.API.Modules.Utils
             return this.IsEqualTol(v, 0.01f);
         }
 
-        public override string ToString()
-        {
-            return $"{X:n2} {Y:n2} {Z:n2}";
-        }
-
         #endregion
 
         protected override void OnDispose()
         {
         }*/
+        
+        public override string ToString()
+        {
+            return $"{X:n2} {Y:n2} {Z:n2}";
+        }
     }
 }

managed/CounterStrikeSharp.API/Modules/Utils/CHandle.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace CounterStrikeSharp.API.Modules.Utils;
 
@@ -11,6 +11,12 @@ public readonly record struct CEntityIndex(uint Value)
     public override string ToString() => $"Entity Index {Value}";
 }
 
+/// <summary>
+/// CHandle is a class that represents a 32-bit ID (entindex + serial number) unique to every past and present entity in a game.
+/// It is used to refer to entities where pointers and entity indexes are unsafe; mainly across the client/server divide.
+/// <a href="https://developer.valvesoftware.com/wiki/CHandle">More info</a>
+/// </summary>
+/// <typeparam name="T">Type of entity this handle refers to</typeparam>
 public class CHandle<T> : IEquatable<CHandle<T>> where T : NativeEntity
 {
     private uint _raw;
@@ -49,15 +55,35 @@ public class CHandle<T> : IEquatable<CHandle<T>> where T : NativeEntity
         _pointer = raw;
     }
 
-    public T? Value => (T)Activator.CreateInstance(typeof(T), EntitySystem.GetEntityByHandle(this));
+
+    /// <inheritdoc cref="Get"/>
+    public T? Value => Get();
+
+    /// <summary>
+    /// Retrieves the instance of the entity this handle refers to.
+    /// </summary>
+    public T? Get()
+    {
+        if (!IsValid)
+            return null;
+
+        var entity = EntitySystem.GetEntityByHandle(this);
+        if (entity == null)
+            return null;
+
+        return (T)Activator.CreateInstance(typeof(T), entity)!;
+    }
 
     public override string ToString() => IsValid ? $"Index = {Index}, Serial = {SerialNum}" : "<invalid>";
 
+    /// <summary>
+    /// Checks that the handle is valid and points to an entity.
+    /// </summary>
     public bool IsValid => Index != (Utilities.MaxEdicts - 1);
 
     public uint Index => (uint)(Raw & (Utilities.MaxEdicts - 1));
     public uint SerialNum => Raw >> Utilities.MaxEdictBits;
-    
+
     public static implicit operator uint(CHandle<T> handle) => handle.Raw;
 
     public bool Equals(CHandle<T>? other)
@@ -81,8 +107,8 @@ public class CEntityHandle : CHandle<CEntityInstance>
     public CEntityHandle(uint raw) : base(raw)
     {
     }
-    
-    public CEntityHandle(IntPtr raw) : base (raw)
+
+    public CEntityHandle(IntPtr raw) : base(raw)
     {
     }
 }
@@ -103,4 +129,4 @@ public class PointerTo<T> : NativeObject where T : NativeObject
             }
         }
     }
-}
+}

managed/CounterStrikeSharp.API/Modules/Utils/QAngle.cs

@@ -14,14 +14,14 @@
  *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
  */
 
-using System;
 using System.Runtime.CompilerServices;
-using CounterStrikeSharp.API.Core;
 
 namespace CounterStrikeSharp.API.Modules.Utils
 {
     public class QAngle : NativeObject
     {
+        public static readonly QAngle Zero = new();
+        
         public QAngle(IntPtr pointer) : base(pointer)
         {
         }

managed/CounterStrikeSharp.API/Modules/Utils/Vector.cs

@@ -1,4 +1,4 @@
-/*
+/*
  *  This file is part of CounterStrikeSharp.
  *  CounterStrikeSharp is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,11 +14,8 @@
  *  along with CounterStrikeSharp.  If not, see <https://www.gnu.org/licenses/>. *
  */
 
-using System;
+using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Utils;
 
 namespace CounterStrikeSharp.API.Modules.Utils
 {
@@ -31,13 +28,18 @@ namespace CounterStrikeSharp.API.Modules.Utils
     /// <item><term>Z</term><description>+up/-down</description></item>
     /// </list>
     /// </summary>
-    public class Vector : NativeObject
+    public class Vector : NativeObject,
+        IAdditionOperators<Vector, Vector, Vector>,
+        ISubtractionOperators<Vector, Vector, Vector>,
+        IMultiplyOperators<Vector, float, Vector>,
+        IDivisionOperators<Vector, float, Vector>
     {
+        public static readonly Vector Zero = new();
+
         public Vector(IntPtr pointer) : base(pointer)
         {
         }
 
-
         public Vector(float? x = null, float? y = null, float? z = null) : this(NativeAPI.VectorNew())
         {
             this.X = x ?? 0;
@@ -48,7 +50,7 @@ namespace CounterStrikeSharp.API.Modules.Utils
         public unsafe ref float X => ref Unsafe.Add(ref *(float*)Handle, 0);
         public unsafe ref float Y => ref Unsafe.Add(ref *(float*)Handle, 1);
         public unsafe ref float Z => ref Unsafe.Add(ref *(float*)Handle, 2);
-        
+
         /// <summary>
         /// Returns a copy of the vector with values replaced.
         /// </summary>
@@ -75,10 +77,10 @@ namespace CounterStrikeSharp.API.Modules.Utils
         {
             this.X += vector.X;
             this.Y += vector.Y;
-            this.Z = this.Z = vector.Z;
+            this.Z += vector.Z;
         }
 
-        
+
         /// <summary>
         /// Returns an angle that represents the normal of the vector.
         /// </summary>
@@ -184,7 +186,7 @@ namespace CounterStrikeSharp.API.Modules.Utils
         public bool IsZero() => NativeAPI.VectorIsZero(Handle);
 
         /// <summary>
-        /// Returns the Euclidean length of the vector: √x² + y² + z² 
+        /// Returns the Euclidean length of the vector: √x² + y² + z²
         /// </summary>
         /// <returns>Euclidean length of vector</returns>
         public float Length() => NativeAPI.VectorLength(Handle);
@@ -238,7 +240,7 @@ namespace CounterStrikeSharp.API.Modules.Utils
             var returnVal = new Vector();
             NativePINVOKE.VectorRotate__SWIG_1(ptr, angle.Handle(), returnVal.Handle());
             Set(returnVal);
-        }        
+        }
 
         /// <summary>
         /// Copies X, Y and Z into this Vector
@@ -299,21 +301,23 @@ namespace CounterStrikeSharp.API.Modules.Utils
 
         public float this[int i]
         {
-            get {
+            get
+            {
                 switch (i)
                 {
                     case 0:
                         return this.X;
                     case 1:
                         return this.Y;
-                        case 2: 
-                    return this.Z;
+                    case 2:
+                        return this.Z;
                 }
 
                 return 0;
             }
-            set {
-                 switch (i)
+            set
+            {
+                switch (i)
                 {
                     case 0:
                         this.X = value;
@@ -321,7 +325,7 @@ namespace CounterStrikeSharp.API.Modules.Utils
                     case 1:
                         this.Y = value;
                         break;
-                    case 2: 
+                    case 2:
                         this.Z = value;
                         break;
                 }
@@ -371,8 +375,8 @@ namespace CounterStrikeSharp.API.Modules.Utils
             return $"{X:n2} {Y:n2} {Z:n2}";
         }
 
-        /*       
+        /*
 
         */
     }
-}
+}

managed/CounterStrikeSharp.API/Server.cs

@@ -19,6 +19,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -27,19 +28,77 @@ namespace CounterStrikeSharp.API
 {
     public class Server
     {
-        public static float TickInterval => NativeAPI.GetTickInterval();
+        /// <summary>
+        /// Duration of a single game tick in seconds, based on a 64 tick server (hard coded in CS2).
+        /// </summary>
+        public static float TickInterval => 0.015625f;
 
+        /// <summary>
+        /// Executes a command on the server, as if it was entered from the console.
+        /// </summary>
+        /// <param name="command"></param>
         public static void ExecuteCommand(string command) => NativeAPI.IssueServerCommand(command);
 
         public static string MapName => NativeAPI.GetMapName();
-        // public static void PrintToConsole(string message) => NativeAPI.PrintToConsole(message);
 
+        /// <summary>
+        /// Returns the total time the server has been running in seconds.
+        /// </summary>
+        /// <remarks>Does not increment when server is hibernating</remarks>
         public static double TickedTime => NativeAPI.GetTickedTime();
+        
+        /// <summary>
+        /// Returns the current map time in seconds, as an interval of the server's tick interval.
+        /// e.g. 70.046875 would represent 70 seconds of map time and the 4483rd tick of the server (70.046875 / 0.015625).
+        /// </summary>
+        /// <remarks>Increments even when server is hibernating</remarks>
         public static float CurrentTime => NativeAPI.GetCurrentTime();
+        
+        /// <summary>
+        /// Returns the current map tick count.
+        /// CS2 is a 64 tick server, so the value will increment by 64 every second.
+        /// </summary>
         public static int TickCount => NativeAPI.GetTickCount();
-        public static float GameFrameTime => NativeAPI.GetGameFrameTime();
+        
+        /// <summary>
+        /// Returns the total time the server has been running in seconds.
+        /// </summary>
+        /// <remarks>Increments even when server is hibernating</remarks>
         public static double EngineTime => NativeAPI.GetEngineTime();
+        
         public static void PrecacheModel(string name) => NativeAPI.PrecacheModel(name);
+        
+        /// <summary>
+        /// <inheritdoc cref="RunOnTick"/>
+        /// Returns Task that completes once the synchronous task has been completed.
+        /// </summary>
+        public static Task RunOnTickAsync(int tick, Action task)
+        {
+            var functionReference = FunctionReference.Create(task, FunctionLifetime.SingleUse);
+            NativeAPI.QueueTaskForFrame(tick, functionReference);
+            return functionReference.CompletionTask;
+        }
+        
+        /// <summary>
+        /// Queue a task to be executed on the specified tick.
+        /// See <see cref="TickCount"/> to retrieve the current tick.
+        /// <remarks>Does not execute if the server is hibernating.</remarks>
+        /// </summary>
+        public static void RunOnTick(int tick, Action task)
+        {
+            RunOnTickAsync(tick, task);
+        }
+
+        /// <summary>
+        /// <inheritdoc cref="NextFrame"/>
+        /// Returns Task that completes once the synchronous task has been completed.
+        /// </summary>
+        public static Task NextFrameAsync(Action task)
+        {
+            var functionReference = FunctionReference.Create(task, FunctionLifetime.SingleUse);
+            NativeAPI.QueueTaskForNextFrame(functionReference);
+            return functionReference.CompletionTask;
+        }
 
         /// <summary>
         /// Queue a task to be executed on the next game frame.
@@ -47,9 +106,18 @@ namespace CounterStrikeSharp.API
         /// </summary>
         public static void NextFrame(Action task)
         {
-            var functionReference = FunctionReference.Create(task);
-            functionReference.Lifetime = FunctionLifetime.SingleUse;
-            NativeAPI.QueueTaskForNextFrame(functionReference);
+            NextFrameAsync(task);
+        }
+        
+        /// <summary>
+        /// <inheritdoc cref="NextWorldUpdate"/>
+        /// Returns Task that completes once the synchronous task has been completed.
+        /// </summary>
+        public static Task NextWorldUpdateAsync(Action task)
+        {
+            var functionReference = FunctionReference.Create(task, FunctionLifetime.SingleUse);
+            NativeAPI.QueueTaskForNextWorldUpdate(functionReference);
+            return functionReference.CompletionTask;
         }
         
         /// <summary>
@@ -59,9 +127,7 @@ namespace CounterStrikeSharp.API
         /// <param name="task"></param>
         public static void NextWorldUpdate(Action task)
         {
-            var functionReference = FunctionReference.Create(task);
-            functionReference.Lifetime = FunctionLifetime.SingleUse;
-            NativeAPI.QueueTaskForNextWorldUpdate(functionReference);
+            NextWorldUpdateAsync(task);
         }
 
         public static void PrintToChatAll(string message)

managed/CounterStrikeSharp.API/Utilities.cs

@@ -42,9 +42,15 @@ namespace CounterStrikeSharp.API
                 .Where(x => flags.HasFlag(x)).AsEnumerable();
         }
 
-        public static T GetEntityFromIndex<T>(int index) where T : CEntityInstance
+        public static T? GetEntityFromIndex<T>(int index) where T : CEntityInstance
         {
-            return (T)Activator.CreateInstance(typeof(T), NativeAPI.GetEntityFromIndex(index))!;
+            var entityPtr = EntitySystem.GetEntityByIndex((uint)index);
+            if (entityPtr is null || entityPtr == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            return (T)Activator.CreateInstance(typeof(T), entityPtr)!;
         }
 
         public static T? CreateEntityByName<T>(string name) where T : CBaseEntity
@@ -52,19 +58,25 @@ namespace CounterStrikeSharp.API
             return (T?)Activator.CreateInstance(typeof(T), VirtualFunctions.UTIL_CreateEntityByName(name, -1));
         }
 
-        public static CCSPlayerController GetPlayerFromIndex(int index)
+        public static CCSPlayerController? GetPlayerFromIndex(int index)
         {
-            return Utilities.GetEntityFromIndex<CCSPlayerController>(index);
+            var player = GetEntityFromIndex<CCSPlayerController>(index);
+            if (player == null || player.DesignerName != "cs_player_controller")
+            {
+                return null;
+            }
+
+            return player;
         }
 
-        public static CCSPlayerController GetPlayerFromSlot(int slot)
+        public static CCSPlayerController? GetPlayerFromSlot(int slot)
         {
-            return Utilities.GetEntityFromIndex<CCSPlayerController>(slot + 1);
+            return GetPlayerFromIndex(slot + 1);
         }
 
-        public static CCSPlayerController GetPlayerFromUserid(int userid)
+        public static CCSPlayerController? GetPlayerFromUserid(int userid)
         {
-            return Utilities.GetEntityFromIndex<CCSPlayerController>((userid & 0xFF) + 1);
+            return GetPlayerFromIndex((userid & 0xFF) + 1);
         }
 
         public static CCSPlayerController? GetPlayerFromSteamId(ulong steamId)
@@ -87,16 +99,16 @@ namespace CounterStrikeSharp.API
             CHandle<CBasePlayerWeapon>? item = null;
             if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.WeaponServices == null) return false;
 
-            foreach(var weapon in player.PlayerPawn.Value.WeaponServices.MyWeapons)
+            foreach (var weapon in player.PlayerPawn.Value.WeaponServices.MyWeapons)
             {
-                if (weapon is not { IsValid: true, Value.IsValid: true }) 
+                if (weapon is not { IsValid: true, Value.IsValid: true })
                     continue;
-                if (weapon.Value.DesignerName != designerName) 
+                if (weapon.Value.DesignerName != designerName)
                     continue;
 
                 item = weapon;
             }
-            
+
             if (item != null && item.Value != null)
             {
                 player.PlayerPawn.Value.RemovePlayerItem(item.Value);
@@ -108,7 +120,7 @@ namespace CounterStrikeSharp.API
 
                 return true;
             }
-            
+
             return false;
         }
 
@@ -121,7 +133,7 @@ namespace CounterStrikeSharp.API
                 yield return new PointerTo<T>(pEntity.Handle).Value;
             }
         }
-        
+
         public static IEnumerable<CEntityInstance> GetAllEntities()
         {
             var pEntity = new CEntityIdentity(EntitySystem.FirstActiveEntity);
@@ -130,7 +142,7 @@ namespace CounterStrikeSharp.API
                 yield return new PointerTo<CEntityInstance>(pEntity.Handle).Value;
             }
         }
-        
+
         /// <summary>
         /// Returns a list of <see cref="CCSPlayerController"/> that are valid and have a valid <see cref="CCSPlayerController.UserId"/> >= 0
         /// </summary>
@@ -142,7 +154,7 @@ namespace CounterStrikeSharp.API
             {
                 var controller = GetPlayerFromSlot(i);
 
-                if (!controller.IsValid || controller.UserId == -1)
+                if (controller == null || !controller.IsValid || controller.Connected != PlayerConnectedState.PlayerConnected)
                     continue;
 
                 players.Add(controller);
@@ -198,7 +210,7 @@ namespace CounterStrikeSharp.API
 
             return (T)Activator.CreateInstance(typeof(T), pointerTo)!;
         }
-        
+
         private static int FindSchemaChain(string className) => Schema.GetSchemaOffset(className, "__m_pChainEntity");
 
         /// <summary>
@@ -216,10 +228,11 @@ namespace CounterStrikeSharp.API
 
             if (!Schema.IsSchemaFieldNetworked(className, fieldName))
             {
-                Application.Instance.Logger.LogWarning("Field {ClassName}:{FieldName} is not networked, but SetStateChanged was called on it.", className, fieldName);
+                Application.Instance.Logger.LogWarning(
+                    "Field {ClassName}:{FieldName} is not networked, but SetStateChanged was called on it.", className, fieldName);
                 return;
             }
-            
+
             int offset = Schema.GetSchemaOffset(className, fieldName);
             int chainOffset = FindSchemaChain(className);
 
@@ -235,4 +248,4 @@ namespace CounterStrikeSharp.API
             entity.IsSteadyState.Clear();
         }
     }
-}
+}

managed/CounterStrikeSharp.SchemaGen/CounterStrikeSharp.SchemaGen.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>