From 9acab82f86933a53d30d484c91deff102c6226b6 Mon Sep 17 00:00:00 2001 From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:57:14 +0100 Subject: [PATCH] Small changes - Correct version - null warnings --- CS2-SimpleAdmin.cs | 831 +++++++++++++++++++++++++++------------------ 1 file changed, 496 insertions(+), 335 deletions(-) diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs index b8c1d8d..cb74684 100644 --- a/CS2-SimpleAdmin.cs +++ b/CS2-SimpleAdmin.cs @@ -8,6 +8,7 @@ using CounterStrikeSharp.API.Modules.Commands.Targeting; using CounterStrikeSharp.API.Modules.Cvars; using CounterStrikeSharp.API.Modules.Entities; using CounterStrikeSharp.API.Modules.Memory; +using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions; using CounterStrikeSharp.API.Modules.Menu; using CounterStrikeSharp.API.Modules.Utils; using Microsoft.Extensions.Localization; @@ -15,15 +16,12 @@ using Microsoft.Extensions.Logging; using MySqlConnector; using System.Collections.Concurrent; using System.Text; -using CS2_SimpleAdmin.Menus; namespace CS2_SimpleAdmin; [MinimumApiVersion(159)] public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig { - public static CS2_SimpleAdmin Instance { get; private set; } = null; - public static IStringLocalizer? _localizer; public static ConcurrentBag gaggedPlayers = new ConcurrentBag(); //public static ConcurrentBag mutedPlayers = new ConcurrentBag(); @@ -39,20 +37,22 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig "CS2-SimpleAdmin"; public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleAuthor => "daffyy"; - public override string ModuleVersion => "1.3.0"; + public override string ModuleVersion => "1.2.9a"; + + private MemoryFunctionVoid? CBasePlayerController_SetPawnFunc; public CS2_SimpleAdminConfig Config { get; set; } = new(); public override void Load(bool hotReload) { - Instance = this; - registerEvents(); if (hotReload) { OnMapStart(string.Empty); } + + CBasePlayerController_SetPawnFunc = new MemoryFunctionVoid(@"\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"); } public void OnConfigParsed(CS2_SimpleAdminConfig config) @@ -157,9 +157,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig ", whoCanExecute: CommandUsage.CLIENT_AND_SERVER)] @@ -275,39 +265,44 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig