fix: Fixed WeaponRestrict

feat: added WeaponRestrict Bypass
feat: added PrintWarnings option

Author: imi-tat0r

CS2-Essentials/CS2-Essentials.json.config.example

@@ -1,9 +1,11 @@
 {
+  "PrintWarnings": true,
   "RapidFireFixMethod": 1,
   "RapidFireReflectScale": 1,
   "AllowedAwpCount": -1,
   "AllowedScoutCount": -1,
   "AllowedAutoSniperCount": -1,
+  "WeaponRestrictBypassFlags": "",
   "UnmatchedFriendlyFire": true,
   "RestrictTeleport": true,
   "AllowAdPrint": true,
@@ -17,5 +19,5 @@
     "RapidFireVote": "full",
 	"Style":"center"
   },
-  "ConfigVersion": 4
+  "ConfigVersion": 5
 }

CS2-Essentials/Extensions/QAngleExtensions.cs

@@ -60,7 +60,7 @@ private static void Normalize(this CounterStrikeSharp.API.Modules.Utils.QAngle a
         angle.Z = (angle.Z + 180.0f) % 360.0f - 180.0f;
     }
 
-    private static bool IsReasonable(this CounterStrikeSharp.API.Modules.Utils.QAngle q )
+    internal static bool IsReasonable(this CounterStrikeSharp.API.Modules.Utils.QAngle q )
     {
         const float r = 360.0f * 1000.0f;
         return
@@ -69,10 +69,10 @@ q.Y is > -r and < r &&
             q.Z is > -r and < r;
     }
 
-    private static bool IsAllowed(this CounterStrikeSharp.API.Modules.Utils.QAngle q)
+    internal static bool IsAllowed(this CounterStrikeSharp.API.Modules.Utils.QAngle q)
     {
         return
-            q.X is >= -179.9f and <= 179.9f &&
+            q.X is >= -179f and <= 179f &&
             q.Y is >= -180.0f and <= 180.0f &&
             q.Z is >= -180.0f and <= 180.0f;
     }

CS2-Essentials/Features/RapidFireFix.cs

@@ -113,6 +113,9 @@ public HookResult OnWeaponFire(EventWeaponFire eventWeaponFire, GameEventInfo in
             lastWarningTime + 3 > Server.CurrentTime) 
             return HookResult.Continue;
 
+        if (!_plugin.Config.PrintWarnings) 
+            return HookResult.Continue;
+        
         // warn player
         Server.PrintToChatAll($"{ChatUtils.FormatMessage(_plugin.Config.ChatPrefix)} Player {ChatColors.Red}{eventWeaponFire.Userid.PlayerName}{ChatColors.Default} tried using {ChatColors.Red}rapid fire{ChatColors.Default}!");
         _rapidFireBlockWarnings[index] = Server.CurrentTime;

CS2-Essentials/Features/TeleportFix.cs

@@ -67,6 +67,9 @@ public HookResult RunCommand(DynamicHook h)
         if (viewAngles is null || viewAngles.IsValid()) 
             return HookResult.Continue;
 
+        // false on super high angles, true on fake up/down
+        var isReasonable = viewAngles.IsReasonable();
+        
         // fix the view angles (prevents the player from using teleport or airstuck)
         viewAngles.Fix();
 
@@ -75,8 +78,11 @@ public HookResult RunCommand(DynamicHook h)
             !(lastWarningTime + 3 <= Server.CurrentTime)) 
             return HookResult.Changed;
 
+        if (!_plugin.Config.PrintWarnings) 
+            return HookResult.Changed;
+        
         // print a warning to all players
-        var feature = player.Pawn.Value!.As<CCSPlayerPawn>().OnGroundLastTick ? "teleport" : "airstuck";
+        var feature = isReasonable ? "fake up/down" : player.Pawn.Value!.As<CCSPlayerPawn>().OnGroundLastTick ? "teleport" : "airstuck";
         Server.PrintToChatAll($"{ChatUtils.FormatMessage(_plugin.Config.ChatPrefix)} Player {ChatColors.Red}{player.PlayerName}{ChatColors.Default} tried using {ChatColors.Red}{feature}{ChatColors.Default}!");
         _teleportBlockWarnings[player.Index] = Server.CurrentTime;
 

CS2-Essentials/Features/WeaponRestrict.cs

@@ -4,6 +4,7 @@
 using CounterStrikeSharp.API.Modules.Cvars.Validators;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Utils;
 using CSSharpUtils.Extensions;
 using CSSharpUtils.Utils;
@@ -24,6 +25,7 @@ public class WeaponRestrict
     public static readonly FakeConVar<int> hvh_restrict_awp = new("hvh_restrict_awp", "Restrict awp to X per team", -1, ConVarFlags.FCVAR_REPLICATED, new RangeValidator<int>(-1, int.MaxValue));
     public static readonly FakeConVar<int> hvh_restrict_scout = new("hvh_restrict_scout", "Restrict scout to X per team", -1, ConVarFlags.FCVAR_REPLICATED, new RangeValidator<int>(-1, int.MaxValue));
     public static readonly FakeConVar<int> hvh_restrict_auto = new("hvh_restrict_auto", "Restrict autosniper to X per team", -1, ConVarFlags.FCVAR_REPLICATED, new RangeValidator<int>(-1, int.MaxValue));
+    public static readonly FakeConVar<string> hvh_bypass_weapon_restrict_flag = new("hvh_bypass_weapon_restrict_flag", "Permission flag to bypass weapon restrictions", "");
 
     public WeaponRestrict(Plugin plugin)
     {
@@ -32,93 +34,53 @@ public WeaponRestrict(Plugin plugin)
         hvh_restrict_awp.Value = _plugin.Config.AllowedAwpCount;
         hvh_restrict_scout.Value = _plugin.Config.AllowedScoutCount;
         hvh_restrict_auto.Value = _plugin.Config.AllowedAutoSniperCount;
+        hvh_bypass_weapon_restrict_flag.Value = _plugin.Config.WeaponRestrictBypassFlags;
     }
 
-    public HookResult OnWeaponCanUse(DynamicHook hook)
+    public HookResult OnWeaponCanAcquire(DynamicHook hook)
     {
-        var weaponServices = hook.GetParam<CCSPlayer_WeaponServices>(0);
-        var weapon = hook.GetParam<CBasePlayerWeapon>(1);
+        var itemServices = hook.GetParam<CCSPlayer_ItemServices>(0);
+        var econItemView = hook.GetParam<CEconItemView>(1);
+        var acquireMethod = hook.GetParam<AcquireMethod>(2);
 
-        var player = new CCSPlayerController(weaponServices.Pawn.Value.Controller.Value!.Handle);
+        // find weapon name from item definition index
+        var itemDefIndex = econItemView.ItemDefinitionIndex;
+        var item = _weaponPrices.FirstOrDefault(kv => (ushort)kv.Value.Item1 == itemDefIndex).Key;
+
+        // not a weapon we want to restrict
+        if (item == null)
+            return HookResult.Continue;
+
+        var player = itemServices.Pawn.Value.Controller.Value!.As<CCSPlayerController>();
 
         // not a player
         if (!player.IsPlayer())
             return HookResult.Continue;
 
-        var item = weapon.DesignerName;
-        
-        // not a weapon we want to restrict
-        if (!_weaponPrices.ContainsKey(item))
+        // player has bypass permission
+        if (hvh_bypass_weapon_restrict_flag.Value != "" &&
+            hvh_bypass_weapon_restrict_flag.Value.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+                .Any(flag => AdminManager.PlayerHasPermissions(player, flag)))
             return HookResult.Continue;
 
-        // not exceeding limits
         var weaponsInTeam = GetWeaponCountInTeam(item, player.Team);
         var allowedWeapons = GetAllowedWeaponCount(item);
-
         var willExceedLimits = allowedWeapons != -1 && weaponsInTeam + 1 > allowedWeapons;
 
+        // not exceeding limits
         if (!willExceedLimits)
             return HookResult.Continue;
-        
+
         // skip warning if we already warned this player in the last 10 seconds
         if (!_lastWeaponRestrictPrint.TryGetValue(player.Pawn.Index, out var lastPrintTime) ||
             lastPrintTime + 10 <= Server.CurrentTime)
         {
             player.PrintToChat($"{ChatUtils.FormatMessage(_plugin.Config.ChatPrefix)} {ChatColors.Red}{item}{ChatColors.Default} is restricted to {ChatColors.Red}{allowedWeapons}{ChatColors.Default} per team!");
-            
             _lastWeaponRestrictPrint[player.Pawn.Index] = Server.CurrentTime;
         }
-        
-        // weapon was created this tick (aka purchased and not picked up)
-        if (Math.Abs(weapon.CreateTime - Server.CurrentTime) < 0.01f)
-        {
-            CCSWeaponBaseGun weaponBaseGun = new(weapon.Handle);
-            weaponBaseGun.Remove();
-        }
-        
-        hook.SetReturn(false);
-        return HookResult.Handled;
-    }
-    
-    public HookResult OnItemPurchase(EventItemPurchase eventItemPurchase, GameEventInfo info)
-    {
-        var player = eventItemPurchase.Userid;
-
-        // not a player
-        if (!player.IsPlayer())
-            return HookResult.Continue;
 
-        // get weapon name
-        var item = eventItemPurchase.Weapon;
-
-        // not a weapon we want to restrict
-        if (!_weaponPrices.ContainsKey(item))
-            return HookResult.Continue;
-
-        // not exceeding limits
-        var weaponsInTeam = GetWeaponCountInTeam(item, player!.Team);
-        var allowedWeapons = GetAllowedWeaponCount(item);
-
-        var willExceedLimits = allowedWeapons != -1 && weaponsInTeam + 1 > allowedWeapons;
-
-        Console.WriteLine(weaponsInTeam);
-        Console.WriteLine(allowedWeapons);
-        
-        if (!willExceedLimits)
-            return HookResult.Continue;
-
-        player.PrintToChat($"{ChatUtils.FormatMessage(_plugin.Config.ChatPrefix)} {ChatColors.Red}{item}{ChatColors.Default} is restricted to {ChatColors.Red}{allowedWeapons}{ChatColors.Default} per team!");
-
-        RefundItem(player, item);
-
-        return HookResult.Continue;
-    }
-    
-    private void RefundItem(CCSPlayerController player, string item)
-    {
-        var moneyServices = player.InGameMoneyServices!;
-        moneyServices.Account += _weaponPrices[item].Item2;
-        Console.WriteLine($"[HvH.gg] Refunding {item} for {_weaponPrices[item].Item2}");
+        hook.SetReturn(acquireMethod == AcquireMethod.PickUp ? AcquireResult.InvalidItem : AcquireResult.AlreadyOwned);
+        return HookResult.Stop;
     }
 
     private int GetAllowedWeaponCount(string item)

CS2-Essentials/Plugin.cs

@@ -13,7 +13,7 @@ namespace hvhgg_essentials;
 public class Plugin : BasePlugin, IPluginConfig<Cs2EssentialsConfig>
 {
     public override string ModuleName => "HvH.gg - Essentials";
-    public override string ModuleVersion => "1.3.0";
+    public override string ModuleVersion => "1.4.0";
     public override string ModuleAuthor => "imi-tat0r";
     public override string ModuleDescription => "Essential features for CS2 HvH servers";
     public Cs2EssentialsConfig Config { get; set; } = new();
@@ -37,6 +37,7 @@ public void OnConfigParsed(Cs2EssentialsConfig config)
         WeaponRestrict.hvh_restrict_awp.Value = Config.AllowedAwpCount;
         WeaponRestrict.hvh_restrict_scout.Value = Config.AllowedScoutCount;
         WeaponRestrict.hvh_restrict_auto.Value = Config.AllowedAutoSniperCount;
+        WeaponRestrict.hvh_bypass_weapon_restrict_flag.Value = Config.WeaponRestrictBypassFlags;
         ResetScore.hvh_resetscore.Value = Config.AllowResetScore;
         RageQuit.hvh_ragequit.Value = Config.AllowRageQuit;
     }
@@ -166,8 +167,7 @@ private void UseWeaponRestrict()
         Console.WriteLine("[HvH.gg] Register weapon restriction listeners");
 
         var weaponRestrict = _serviceProvider!.GetRequiredService<WeaponRestrict>();
-        RegisterEventHandler<EventItemPurchase>(weaponRestrict.OnItemPurchase);
-        VirtualFunctions.CCSPlayer_WeaponServices_CanUseFunc.Hook(weaponRestrict.OnWeaponCanUse, HookMode.Pre);
+        VirtualFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Hook(weaponRestrict.OnWeaponCanAcquire, HookMode.Pre);
 
         Console.WriteLine("[HvH.gg] Finished registering weapon restriction listeners");
     }
@@ -184,8 +184,7 @@ public override void Unload(bool hotReload)
         VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Unhook(friendlyFire.OnTakeDamage, HookMode.Pre);
 
         var weaponRestrict = _serviceProvider.GetRequiredService<WeaponRestrict>();
-        RegisterEventHandler<EventItemPurchase>(weaponRestrict.OnItemPurchase);
-        VirtualFunctions.CCSPlayer_WeaponServices_CanUseFunc.Unhook(weaponRestrict.OnWeaponCanUse, HookMode.Pre);
+        VirtualFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Unhook(weaponRestrict.OnWeaponCanAcquire, HookMode.Pre);
 
         var teleportFix = _serviceProvider.GetRequiredService<TeleportFix>();
         RunCommand.Unhook(teleportFix.RunCommand, HookMode.Pre);

CS2-Essentials/PluginConfig.cs

@@ -14,11 +14,13 @@ public class Cs2CustomVoteSettings
 
 public partial class Cs2EssentialsConfig : BasePluginConfig
 {
+    [JsonPropertyName("PrintWarnings")] public bool PrintWarnings { get; set; } = true;
     [JsonPropertyName("RapidFireFixMethod")] public FixMethod RapidFireFixMethod { get; set; } = FixMethod.Ignore;
     [JsonPropertyName("RapidFireReflectScale")] public float RapidFireReflectScale { get; set; } = 1f;
     [JsonPropertyName("AllowedAwpCount")] public int AllowedAwpCount { get; set; } = -1;
     [JsonPropertyName("AllowedScoutCount")] public int AllowedScoutCount { get; set; } = -1;
     [JsonPropertyName("AllowedAutoSniperCount")] public int AllowedAutoSniperCount { get; set; } = -1;
+    [JsonPropertyName("WeaponRestrictBypassFlags")] public string WeaponRestrictBypassFlags { get; set; } = "";
     [JsonPropertyName("UnmatchedFriendlyFire")] public bool UnmatchedFriendlyFire { get; set; } = true;
     [JsonPropertyName("RestrictTeleport")] public bool RestrictTeleport { get; set; } = true;
     [JsonPropertyName("AllowAdPrint")] public bool AllowAdPrint { get; set; } = true;
@@ -27,5 +29,5 @@ public partial class Cs2EssentialsConfig : BasePluginConfig
     [JsonPropertyName("AllowRageQuit")] public bool AllowRageQuit { get; set; } = true;
     [JsonPropertyName("ChatPrefix")] public string ChatPrefix { get; set; } = "[{Red}Hv{DarkRed}H{Default}.gg]";
     [JsonPropertyName("CustomVoteSettings")] public Cs2CustomVoteSettings CustomVoteSettings { get; set; } = new();
-    [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 4;
+    [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 5;
 }

README.MD

@@ -1,6 +1,6 @@
 ![Copyright ev0lve Digital](https://img.shields.io/badge/Copyright-ev0lve%20Digital-blue) ![GitHub License](https://img.shields.io/github/license/HvH-gg/CS2-Essentials) ![Issues](https://img.shields.io/github/issues/HvH-gg/CS2-Essentials) ![Downloads](https://img.shields.io/github/downloads/HvH-gg/CS2-Essentials/total) ![Stars](https://img.shields.io/github/stars/HvH-gg/CS2-Essentials)
 
-# [HvH.gg](https://hvh.gg) CS2 Essentials (1.3.0)
+# [HvH.gg](https://hvh.gg) CS2 Essentials (1.4.0)
 ### If you use this plugin, you do NOT need [RapidFireFix](https://github.com/HvH-gg/RapidFireFix) anymore.
 
 Our CS2 Essentials plugin is the only plugin you need to run a successful HvH server. It includes basic features like **reset score** and **rage quit** as well as optional restrictions for **weapons**, **friendly fire**, **rapid fire** and other exploit/crash fixes.