v1.0.4

jRandomSkills - SRC Files/src/player/skills/Aimbot.cs

@@ -1,5 +1,4 @@
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -16,31 +15,30 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
             CCSPlayerPawn victimPawn = new(param.Handle);
 
             if (attackerPawn.DesignerName != "player" || victimPawn.DesignerName != "player")
-                return HookResult.Continue;
+                return;
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null || victimPawn == null || victimPawn.Controller?.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
             CCSPlayerController victim = victimPawn.Controller.Value.As<CCSPlayerController>();
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-            if (playerInfo == null) return HookResult.Continue;
+            if (playerInfo == null) return;
 
             if (attacker.PawnIsAlive)
             {   
@@ -60,8 +58,12 @@ namespace jRandomSkills
                     }
                 }
             }
+        }
 
-            return HookResult.Continue;
+        public static void DisableSkill(CCSPlayerController _)
+        {
+            foreach (var hit in hitGroups)
+                Marshal.WriteInt32(hit.Key, 56, hit.Value);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#ff0000", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Anomaly.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -19,64 +18,37 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                    {
+                        UpdateHUD(player, skillInfo);
+                        if (Server.TickCount % tickRate != 0) return;
+                        var pawn = player.PlayerPawn.Value;
+                        if (pawn != null && pawn.IsValid && pawn.AbsOrigin != null)
                         {
-                            UpdateHUD(player, skillInfo);
-                            if (Server.TickCount % tickRate != 0) return;
-                            var pawn = player.PlayerPawn.Value;
-                            if (pawn != null && pawn.IsValid && pawn.AbsOrigin != null)
+                            if (skillInfo.LastRotations == null || skillInfo.LastPositions == null) continue;
+                            skillInfo.LastPositions.Add(new Vector(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z));
+                            skillInfo.LastRotations.Add(new QAngle(pawn.EyeAngles.X, pawn.EyeAngles.Y, pawn.EyeAngles.Z));
+                            if (skillInfo.LastRotations.Count > maxSize)
                             {
-                                if (skillInfo.LastRotations == null || skillInfo.LastPositions == null) continue;
-                                skillInfo.LastPositions.Add(new Vector(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z));
-                                skillInfo.LastRotations.Add(new QAngle(pawn.EyeAngles.X, pawn.EyeAngles.Y, pawn.EyeAngles.Z));
-                                if (skillInfo.LastRotations.Count > maxSize)
-                                {
-                                    skillInfo.LastPositions.RemoveAt(0);
-                                    skillInfo.LastRotations.RemoveAt(0);
-                                }
+                                skillInfo.LastPositions.RemoveAt(0);
+                                skillInfo.LastRotations.RemoveAt(0);
                             }
                         }
-                }
-            });
+                    }
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/AntyFlash.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -14,44 +13,25 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        public static void PlayerBlind(EventPlayerBlind @event)
+        {
+            var player = @event.Userid;
+            var attacker = @event.Attacker;
+            if (player == null || !player.IsValid || player.LifeState != (byte)LifeState_t.LIFE_ALIVE) return;
+            if (attacker == null || !attacker.IsValid) return;
 
-                return HookResult.Continue;
-            });
+            var playerPawn = player.PlayerPawn.Value;
+            if (playerPawn == null || !playerPawn.IsValid) return;
 
-            Instance.RegisterEventHandler<EventPlayerBlind>((@event, info) =>
-            {
-                var player = @event.Userid;
-                var attacker = @event.Attacker;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
 
-                if (player == null || !player.IsValid || player.LifeState != (byte)LifeState_t.LIFE_ALIVE) return HookResult.Continue;
-                if (attacker == null || !attacker.IsValid) return HookResult.Continue;
-
-                var playerPawn = player.PlayerPawn.Value;
-                if (playerPawn == null || !playerPawn.IsValid) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-
-                if (playerInfo?.Skill == skillName)
-                    playerPawn.FlashDuration = 0.0f;
-                else if (attackerInfo?.Skill == skillName)
-                    playerPawn.FlashDuration = 7.0f;
-
-                return HookResult.Continue;
-            });
+            if (playerInfo?.Skill == skillName)
+                playerPawn.FlashDuration = 0.0f;
+            else if (attackerInfo?.Skill == skillName)
+                playerPawn.FlashDuration = 7.0f;
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/AntyHead.cs

@@ -12,25 +12,18 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                int hitgroup = @event.Hitgroup;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int hitgroup = @event.Hitgroup;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-
-                if (playerInfo?.Skill == skillName && hitgroup == (int)HitGroup_t.HITGROUP_HEAD)
-                {
-                    ApplyIronHeadEffect(victim!, @event.DmgHealth);
-                    return HookResult.Stop;
-                }
-
-                return HookResult.Continue;
-            });
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (playerInfo?.Skill == skillName && hitgroup == (int)HitGroup_t.HITGROUP_HEAD)
+                ApplyIronHeadEffect(victim!, @event.DmgHealth);
         }
 
         private static void ApplyIronHeadEffect(CCSPlayerController victim, float damage)

jRandomSkills - SRC Files/src/player/skills/AreaReaper.cs

@@ -16,32 +16,13 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    EnableBombsite();
-                });
-
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+            Instance.AddTimer(0.1f, EnableBombsite);
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -78,19 +59,16 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("areareaper") + ":", false);
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("areareaper_select_info")}");
-            player.PrintToChat($" {ChatColors.Green}· {ChatColors.Red}/t {ChatColors.Green}A");
-            player.PrintToChat($" {ChatColors.Green}· {ChatColors.Red}/t {ChatColors.Green}B");
+            HashSet<(string, string)> menuItems = [(Localization.GetTranslation("bombsite_a"), "a"), (Localization.GetTranslation("bombsite_b"), "b")];
+            SkillUtils.CreateMenu(player, menuItems);
         }
 
-#pragma warning disable IDE0060 // Usuń nieużywany parametr
         public static void DisableSkill(CCSPlayerController player)
-#pragma warning restore IDE0060 // Usuń nieużywany parametr
         {
-            if (Instance.SkillPlayer.FirstOrDefault(p => p.Skill == skillName) != null)
-                return;
+            SkillUtils.CloseMenu(player);
+            if (Instance.SkillPlayer.FirstOrDefault(p => p.Skill == skillName) != null) return;
             EnableBombsite();
+
         }
 
         private static void EnableBombsite()

jRandomSkills - SRC Files/src/player/skills/Armored.cs

@@ -1,6 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -16,25 +14,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -48,36 +27,34 @@ namespace jRandomSkills
             SkillUtils.PrintToChat(player, $"{ChatColors.DarkRed}{Localization.GetTranslation("armored")}{ChatColors.Lime}: " + Localization.GetTranslation("armored_desc2", newScale), false);
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
             CCSPlayerPawn victimPawn = new(param.Handle);
 
             if (attackerPawn.DesignerName != "player" || victimPawn.DesignerName != "player")
-                return HookResult.Continue;
+                return;
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null || victimPawn == null || victimPawn.Controller?.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
             CCSPlayerController victim = victimPawn.Controller.Value.As<CCSPlayerController>();
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim.SteamID);
-            if (playerInfo == null) return HookResult.Continue;
+            if (playerInfo == null) return;
 
             if (playerInfo.Skill == skillName && victim.PawnIsAlive)
             {
                 float? skillChance = playerInfo.SkillChance;
                 param2.Damage *= skillChance ?? 1f;
             }
-
-            return HookResult.Continue;
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#d1430a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float chanceFrom = .65f, float chanceTo = .85f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Assassin.cs

@@ -15,26 +15,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var damage = @event.DmgHealth;
-                var victim = @event.Userid;
-                var attacker = @event.Attacker;
-                var weapon = @event.Weapon;
-                HitGroup_t hitgroup = (HitGroup_t)@event.Hitgroup;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var damage = @event.DmgHealth;
+            var victim = @event.Userid;
+            var attacker = @event.Attacker;
+            var weapon = @event.Weapon;
+            HitGroup_t hitgroup = (HitGroup_t)@event.Hitgroup;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-                if (nades.Contains(weapon)) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            if (nades.Contains(weapon)) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                if (IsBehind(attacker!, victim!))
-                    SkillUtils.TakeHealth(victim!.PlayerPawn.Value, (int)(damage * (damageMultiplier - 1f)));
-                
-                return HookResult.Continue;
-            });
+            if (IsBehind(attacker!, victim!))
+                SkillUtils.TakeHealth(victim!.PlayerPawn.Value, (int)(damage * (damageMultiplier - 1f)));
         }
 
         private static bool IsBehind(CCSPlayerController attacker, CCSPlayerController victim)

jRandomSkills - SRC Files/src/player/skills/Astronaut.cs

@@ -14,31 +14,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        var playerPawn = player.PlayerPawn.Value;
-
-                        if (playerInfo?.Skill == skillName && playerPawn != null)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -46,6 +21,12 @@ namespace jRandomSkills
             ApplyGravityModifier(player);
         }
 
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                DisableSkill(player);
+        }
+
         public static void DisableSkill(CCSPlayerController player)
         {
             if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return;

jRandomSkills - SRC Files/src/player/skills/Baseball.cs

@@ -18,77 +18,56 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var victim = @event.Userid;
-                var attacker = @event.Attacker;
-                var weapon = @event.Weapon;
-
-                if (weapon != "decoy") return HookResult.Continue;
-                if (!Instance.IsPlayerValid(victim) || !Instance.IsPlayerValid(attacker)) return HookResult.Continue;
-
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (attackerInfo?.Skill != skillName) return HookResult.Continue;
-
-                SkillUtils.TakeHealth(victim!.PlayerPawn.Value, damageDeal);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnEntitySpawned>(@event =>
-            {
-                var name = @event.DesignerName;
-                if (name != "decoy_projectile")
-                    return;
-
-                var decoy = @event.As<CDecoyProjectile>();
-                if (decoy == null || !decoy.IsValid || decoy.OwnerEntity == null || decoy.OwnerEntity.Value == null || !decoy.OwnerEntity.Value.IsValid) return;
-                
-                var pawn = decoy.OwnerEntity.Value.As<CCSPlayerPawn>();
-                if (pawn == null || !pawn.IsValid || pawn.Controller == null || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
-                
-                var player = pawn.Controller.Value.As<CCSPlayerController>();
-                if (player == null || !player.IsValid) return;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return;
-                decoys.Add(decoy);
-            });
-
-            Instance.RegisterEventHandler<EventDecoyStarted>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var decoy = decoys.FirstOrDefault(d => d.Index == @event.Entityid);
-                if (decoy != null && decoy.IsValid)
-                    decoy.Remove();
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            var attacker = @event.Attacker;
+            var weapon = @event.Weapon;
+
+            if (weapon != "decoy") return;
+            if (!Instance.IsPlayerValid(victim) || !Instance.IsPlayerValid(attacker)) return;
+
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (attackerInfo?.Skill != skillName) return;
+
+            SkillUtils.TakeHealth(victim!.PlayerPawn.Value, damageDeal);
+        }
+
+        public static void OnEntitySpawned(CEntityInstance entity)
+        {
+            var name = entity.DesignerName;
+            if (name != "decoy_projectile")
+                return;
+
+            var decoy = entity.As<CDecoyProjectile>();
+            if (decoy == null || !decoy.IsValid || decoy.OwnerEntity == null || decoy.OwnerEntity.Value == null || !decoy.OwnerEntity.Value.IsValid) return;
+
+            var pawn = decoy.OwnerEntity.Value.As<CCSPlayerPawn>();
+            if (pawn == null || !pawn.IsValid || pawn.Controller == null || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
+
+            var player = pawn.Controller.Value.As<CCSPlayerController>();
+            if (player == null || !player.IsValid) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            decoys.Add(decoy);
+        }
+
+        public static void DecoyStarted(EventDecoyStarted @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            var decoy = decoys.FirstOrDefault(d => d.Index == @event.Entityid);
+            if (decoy != null && decoy.IsValid)
+                decoy.Remove();
+        }
+
+        public static void OnTick()
         {
             foreach (var decoy in decoys)
             {

jRandomSkills - SRC Files/src/player/skills/Behind.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -14,42 +13,19 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event!.Attacker;
+            var victim = @event!.Userid;
 
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
 
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event!.Attacker;
-                var victim = @event!.Userid;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) 
-                    return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
-                {
-                    if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
-                        RotateEnemy(victim);
-                }
-                
-                return HookResult.Continue;
-            });
+            if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
+                if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
+                    RotateEnemy(victim);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/BladeMaster.cs

@@ -16,38 +16,38 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
+            HitGroup_t hitGroup = (HitGroup_t)@event.Hitgroup;
+            string weapon = @event.Weapon;
+
+            if (noReflectionWeapon.Contains(weapon) || !Instance.IsPlayerValid(victim)) return;
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (victimInfo == null || victimInfo.Skill != skillName) return;
+
+            int chance = Instance.Random.Next(0, 101);
+            if (hitGroup == HitGroup_t.HITGROUP_LEFTLEG || hitGroup == HitGroup_t.HITGROUP_RIGHTLEG)
             {
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-                HitGroup_t hitGroup = (HitGroup_t)@event.Hitgroup;
-                string weapon = @event.Weapon;
+                if (chance > legReflectionChance)
+                    return;
+            }
+            else
+                if (chance > torseReflectionChance)
+                    return;
 
-                if (noReflectionWeapon.Contains(weapon) || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
+            var pawn = victim!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid) return;
 
-                int chance = Instance.Random.Next(0, 101);
-                if (hitGroup == HitGroup_t.HITGROUP_LEFTLEG || hitGroup == HitGroup_t.HITGROUP_RIGHTLEG)
-                {
-                    if (chance > legReflectionChance)
-                        return HookResult.Continue;
-                }
-                else
-                    if (chance > torseReflectionChance)
-                    return HookResult.Continue;
+            var weaponServices = pawn.WeaponServices;
+            if (weaponServices == null) return;
+            if (weaponServices.ActiveWeapon == null || !weaponServices.ActiveWeapon.IsValid || weaponServices.ActiveWeapon.Value == null || !weaponServices.ActiveWeapon.Value.IsValid || weaponServices.ActiveWeapon.Value.DesignerName != "weapon_knife")
+                return;
 
-                var pawn = victim!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid) return HookResult.Continue;
-
-                var weaponServices = pawn.WeaponServices;
-                if (weaponServices == null) return HookResult.Continue;
-                if (weaponServices.ActiveWeapon == null || !weaponServices.ActiveWeapon.IsValid || weaponServices.ActiveWeapon.Value == null || !weaponServices.ActiveWeapon.Value.IsValid || weaponServices.ActiveWeapon.Value.DesignerName != "weapon_knife") return HookResult.Continue;
-
-                RestoreHealth(victim, damage);
-                return HookResult.Stop;
-            });
+            RestoreHealth(victim, damage);
         }
 
         private static void RestoreHealth(CCSPlayerController victim, float damage)

jRandomSkills - SRC Files/src/player/skills/BunnyHop.cs

@@ -2,7 +2,6 @@ using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,10 +16,9 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            Instance.RegisterListener<OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {
@@ -34,6 +32,7 @@ namespace jRandomSkills
         {
             var playerPawn = player.PlayerPawn.Value;
             if (playerPawn == null || !playerPawn.IsValid) return;
+            if (JumpBan.bannedPlayers.ContainsKey(playerPawn)) return;
 
             var flags = (PlayerFlags)playerPawn.Flags;
             var buttons = player.Buttons;

jRandomSkills - SRC Files/src/player/skills/C4Camouflage.cs

@@ -4,7 +4,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -12,89 +11,41 @@ namespace jRandomSkills
     public class C4Camouflage : ISkill
     {
         private const Skills skillName = Skills.C4Camouflage;
-        private static bool exists = false;
         private static readonly Dictionary<ulong, List<uint>> invisibleEntities = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            EnableSkill(player!);
+        }
+
+        public static void WeaponEquip(EventItemEquip @event)
+        {
+            var player = @event.Userid;
+            var weapon = @event.Item;
+
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            if (weapon == "c4")
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        DisableSkill(player);
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerPawn = player.PlayerPawn?.Value;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
+                SetPlayerVisibility(player!, false);
+                SetWeaponVisibility(player!, false);
+            }
+            else
             {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    DisableSkill(player);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                EnableSkill(player!);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemEquip>((@event, info) =>
-            {
-                var player = @event.Userid;
-                var weapon = @event.Item;
-                
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                if (weapon == "c4")
-                {
-                    SetPlayerVisibility(player!, false);
-                    SetWeaponVisibility(player!, false);
-                }
-                else
-                {
-                    SetPlayerVisibility(player!, true);
-                    SetWeaponVisibility(player!, true);
-                }
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) continue;
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        DisableSkill(player);
-                }
-                Instance.RemoveListener<CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
+                SetPlayerVisibility(player!, true);
+                SetWeaponVisibility(player!, true);
+            }
         }
 
         public static void CheckTransmit([CastFrom(typeof(nint))] CCheckTransmitInfoList infoList)
@@ -111,10 +62,7 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            if (!exists)
-                Instance.RegisterListener<CheckTransmit>(CheckTransmit);
-            exists = true;
-
+            Event.enableTransmit = true;
             if (player == null || !player.IsValid) return;
             var playerPawn = player.PlayerPawn.Value;
 
@@ -129,7 +77,6 @@ namespace jRandomSkills
             SetWeaponVisibility(player, false);
         }
 
-
         public static void DisableSkill(CCSPlayerController player)
         {
             SetPlayerVisibility(player, true);

jRandomSkills - SRC Files/src/player/skills/Catapult.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -14,46 +13,23 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+
+            if (attackerInfo?.Skill == skillName && victim!.PawnIsAlive)
+                if (Instance.Random.NextDouble() <= attackerInfo.SkillChance)
                 {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                if (attackerInfo?.Skill == skillName && victim!.PawnIsAlive)
-                {
-                    if (Instance.Random.NextDouble() <= attackerInfo.SkillChance)
-                    {
-                        var victimPawn = victim.PlayerPawn?.Value;
-                        if (victimPawn != null)
-                        {
-                            victimPawn.AbsVelocity.Z = 300f;
-                        }
-                    }
+                    var victimPawn = victim.PlayerPawn?.Value;
+                    if (victimPawn != null)
+                        victimPawn.AbsVelocity.Z = 300f;
                 }
-                
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Chicken.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 using jRandomSkills.src.utils;
 using CounterStrikeSharp.API.Core.Attributes;
@@ -13,8 +12,6 @@ namespace jRandomSkills
     public class Chicken : ISkill
     {
         private const Skills skillName = Skills.Chicken;
-        private static bool roundEnd = false;
-        private static bool exists = false;
         private static readonly string[] disabledWeapons =
         [
             "weapon_ak47", "weapon_m4a4", "weapon_m4a1", "weapon_m4a1_silencer",
@@ -30,70 +27,21 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                roundEnd = false;
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        }
 
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SetWeaponAttack(player, false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) continue;
-
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill != skillName) continue;
-                    DisableSkill(player);
-                }
-                roundEnd = true;
-                Instance.RemoveListener<CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    DisableSkill(player);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                SetWeaponAttack(player, true);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                    SetWeaponAttack(player, false);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(OnTick);
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            SetWeaponAttack(player, true);
         }
 
         public static void CheckTransmit([CastFrom(typeof(nint))] CCheckTransmitInfoList infoList)
@@ -112,10 +60,7 @@ namespace jRandomSkills
             var playerPawn = player.PlayerPawn?.Value;
             if (playerPawn != null && playerPawn.IsValid)
             {
-                if (!exists)
-                    Instance.RegisterListener<CheckTransmit>(CheckTransmit);
-                exists = true;
-
+                Event.enableTransmit = true;
                 playerPawn.VelocityModifier = 1.1f;
 
                 playerPawn.Health = 50;
@@ -165,7 +110,7 @@ namespace jRandomSkills
 
         private static void SetWeaponAttack(CCSPlayerController player, bool disableWeapon)
         {
-            if (roundEnd || player == null || !player.IsValid) return;
+            if (player == null || !player.IsValid) return;
             var pawn = player?.PlayerPawn?.Value;
             if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null || pawn.WeaponServices.MyWeapons == null) return;
 
@@ -200,7 +145,7 @@ namespace jRandomSkills
             Instance.AddTimer(1f, () => chickens.TryAdd(player, chickenModel));
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var valuePair in chickens)
             {

jRandomSkills - SRC Files/src/player/skills/ChillOut.cs

@@ -14,28 +14,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventBombBeginplant>((@event, info) =>
+        }
+
+        public static void BombBeginplant(EventBombBeginplant @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+
+            var anyChillOut = Instance.SkillPlayer.FirstOrDefault(p => p.Skill == skillName);
+            if (anyChillOut != null)
             {
-                var player = @event.Userid;
-
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-
-                var anyChillOut = Instance.SkillPlayer.FirstOrDefault(p => p.Skill == skillName);
-                if (anyChillOut != null)
+                var bombEntities = Utilities.FindAllEntitiesByDesignerName<CC4>("weapon_c4").ToList();
+                if (bombEntities.Count != 0)
                 {
-                    var bombEntities = Utilities.FindAllEntitiesByDesignerName<CC4>("weapon_c4").ToList();
-
-                    if (bombEntities.Count != 0)
-                    {
-                        var bomb = bombEntities.FirstOrDefault();
-                        if (bomb != null)
-                            bomb.ArmedTime = Server.CurrentTime + bombArmedTime;
-                    }
+                    var bomb = bombEntities.FirstOrDefault();
+                    if (bomb != null)
+                        bomb.ArmedTime = Server.CurrentTime + bombArmedTime;
                 }
-
-                return HookResult.Continue;
-            });
+            }
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#343deb", CsTeam onlyTeam = CsTeam.CounterTerrorist, bool needsTeammates = false, float bombArmedTime = 10f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Cutter.cs

@@ -12,23 +12,21 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var damage = @event.DmgHealth;
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                var weapon = @event.Weapon;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var damage = @event.DmgHealth;
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            var weapon = @event.Weapon;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                if (weapon == "knife")
-                    SkillUtils.TakeHealth(victim!.PlayerPawn.Value, 9999);
-                return HookResult.Continue;
-            });
+            if (weapon == "knife")
+                SkillUtils.TakeHealth(victim!.PlayerPawn.Value, 9999);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#88a31a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Darkness.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using System.Collections.Generic;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -18,40 +17,33 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in defaultPostProcessings.Keys)
+                DisableSkill(player);
+            foreach (var postProcessing in newPostProcessing)
+                postProcessing.Remove();
+            newPostProcessing.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in defaultPostProcessings.Keys)
-                    DisableSkill(player);
-                foreach (var postProcessing in newPostProcessing)
-                    postProcessing.Remove();
-                newPostProcessing.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                SetUpPostProcessing(player, true);
-                return HookResult.Continue;
-            });
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -87,23 +79,20 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("darkness") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("darkness_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             SetUpPostProcessing(player, true);
+            SkillUtils.CloseMenu(player);
         }
 
         private static void SetUpPostProcessing(CCSPlayerController player, bool dontCreateNew = false)

jRandomSkills - SRC Files/src/player/skills/Deactivator.cs

@@ -13,34 +13,39 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+                if (enemies.Length > 0)
                 {
-                    foreach (var player in Utilities.GetPlayers())
+                    HashSet<(string, string)> menuItems = [];
+                    foreach (var enemy in enemies)
                     {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
+                        var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
+                        if (enemyInfo == null) continue;
+                        var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
+                        if (skillData == null) continue;
+                        menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
                     }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        DisableSkill(player);
+                    SkillUtils.CreateMenu(player, menuItems);
                 }
-                return HookResult.Continue;
-            });
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -68,24 +73,22 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("deactivator") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("deactivator_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
+                HashSet<(string, string)> menuItems = [];
                 foreach (var enemy in enemies)
                 {
                     var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
                     if (enemyInfo == null) continue;
                     var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
                     if (skillData == null) continue;
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}: {ChatColors.Red}{skillData.Name}");
+                    menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
                 }
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -93,6 +96,7 @@ namespace jRandomSkills
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
             if (playerInfo == null) return;
             playerInfo.SpecialSkill = Skills.None;
+            SkillUtils.CloseMenu(player);
         }
 
         private static void DeacitvateSkill(CCSPlayerController player, CCSPlayerController enemy)

jRandomSkills - SRC Files/src/player/skills/Deaf.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
@@ -14,50 +15,38 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                deafPlayers.Clear();
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
+        public static void NewRound()
+        {
+            foreach (var player in deafPlayers)
                 DisableSkill(player);
-                return HookResult.Continue;
-            });
+            deafPlayers.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
+        public static void PlayerMakeSound(UserMessage um)
+        {
+            foreach (var player in deafPlayers)
+                um.Recipients.Remove(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                foreach (var player in deafPlayers)
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-            Instance.HookUserMessage(208, um =>
-            {
-                var soundevent = um.ReadUInt("soundevent_hash");
-                var userIndex = um.ReadUInt("source_entity_index");
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-                foreach (var player in deafPlayers)
-                    um.Recipients.Remove(player);
-
-                return HookResult.Continue;
-            }, HookMode.Pre);
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -93,23 +82,20 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("deaf") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("deaf_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             deafPlayers.Remove(player);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#dae01f", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Disarmament.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -14,47 +13,29 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+
+            if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
             {
-                Instance.AddTimer(0.1f, () =>
+                if (Instance.Random.NextDouble() <= playerInfo?.SkillChance)
                 {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
+                    var weaponServices = victim.PlayerPawn?.Value?.WeaponServices;
+                    if (weaponServices?.ActiveWeapon == null) return;
 
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
-                {
-                    if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
-                    {
-                        var weaponServices = victim.PlayerPawn?.Value?.WeaponServices;
-                        if (weaponServices?.ActiveWeapon == null) return HookResult.Continue;
-
-                        var weaponName = weaponServices?.ActiveWeapon?.Value?.DesignerName;
-                        if (weaponName != null && !weaponName.Contains("weapon_knife") && !weaponName.Contains("weapon_c4"))
-                            victim.ExecuteClientCommand("slot3");
-                            //victim.DropActiveWeapon();
-                    }
+                    var weaponName = weaponServices?.ActiveWeapon?.Value?.DesignerName;
+                    if (weaponName != null && !weaponName.Contains("weapon_knife") && !weaponName.Contains("weapon_c4"))
+                        victim.ExecuteClientCommand("slot3");
+                        //victim.DropActiveWeapon();
                 }
-                return HookResult.Continue;
-            });
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Distancer.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
 {
@@ -15,34 +14,14 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in distancerPlayers)
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void NewRound()
+        {
+            distancerPlayers.Clear();
+        }
+
+        public static void OnTick()
         {
             foreach (var player in distancerPlayers)
             {

jRandomSkills - SRC Files/src/player/skills/Dracula.cs

@@ -14,22 +14,18 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
+        }
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
 
-                if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
-                {
-                    HealAttacker(attacker!, @event.DmgHealth);
-                }
-                return HookResult.Continue;
-            });
+            if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
+                HealAttacker(attacker!, @event.DmgHealth);
         }
 
         private static void HealAttacker(CCSPlayerController attacker, float damage)

jRandomSkills - SRC Files/src/player/skills/Duplicator.cs

@@ -13,23 +13,39 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p != player && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+                if (enemies.Length > 0)
+                {
+                    HashSet<(string, string)> menuItems = [];
+                    foreach (var enemy in enemies)
+                    {
+                        var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
+                        if (enemyInfo == null) continue;
+                        var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
+                        if (skillData == null) continue;
+                        menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
+                    }
+                    SkillUtils.CreateMenu(player, menuItems);
+                }
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -57,24 +73,22 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("duplicator") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("duplicator_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p != player && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p != player && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
+                HashSet<(string, string)> menuItems = [];
                 foreach (var enemy in enemies)
                 {
                     var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
                     if (enemyInfo == null) continue;
                     var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
                     if (skillData == null) continue;
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}: {ChatColors.Red}{skillData.Name}");
+                    menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
                 }
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -82,6 +96,7 @@ namespace jRandomSkills
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
             if (playerInfo == null) return;
             playerInfo.SpecialSkill = Skills.None;
+            SkillUtils.CloseMenu(player);
         }
 
         private static void DuplicateSkill(CCSPlayerController player, CCSPlayerController enemy)
@@ -91,10 +106,12 @@ namespace jRandomSkills
 
             if (playerInfo != null && enemyInfo != null)
             {
-                playerInfo.Skill = enemyInfo.Skill;
-                playerInfo.SpecialSkill = skillName;
-                Instance.SkillAction(enemyInfo.Skill.ToString(), "EnableSkill", [player]);
-
+                Instance.AddTimer(.1f, () =>
+                {
+                    playerInfo.Skill = enemyInfo.Skill;
+                    playerInfo.SpecialSkill = skillName;
+                    Instance.SkillAction(enemyInfo.Skill.ToString(), "EnableSkill", [player]);
+                });
                 player.PrintToChat($" {ChatColors.Green}" + Localization.GetTranslation("duplicator_player_info", enemy.PlayerName));
             }
         }

jRandomSkills - SRC Files/src/player/skills/Dwarf.cs

@@ -14,49 +14,18 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                        player.Respawn();
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        DisableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                DisableSkill(player);
-                return HookResult.Continue;
-            });
         }
 
-        public static void EnableSkill(CCSPlayerController player)
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+            {
+                if (!Instance.IsPlayerValid(player)) continue;
+                DisableSkill(player);
+            }
+        }
+
+        public static unsafe void EnableSkill(CCSPlayerController player)
         {
             var playerPawn = player.PlayerPawn?.Value;
             if (playerPawn != null && player.IsValid)
@@ -67,6 +36,7 @@ namespace jRandomSkills
                 // playerPawn.CBodyComponent.SceneNode.GetSkeletonInstance().Scale = newSize;
                 if (playerPawn.CBodyComponent == null || playerPawn.CBodyComponent.SceneNode == null) return;
                 playerPawn.CBodyComponent.SceneNode.Scale = newSize;
+
                 Utilities.SetStateChanged(playerPawn, "CBaseEntity", "m_CBodyComponent");
                 SkillUtils.PrintToChat(player, $"{ChatColors.DarkRed}{Localization.GetTranslation("dwarf")}{ChatColors.Lime}: " + Localization.GetTranslation("dwarf_desc2", newSize), false);
             }

jRandomSkills - SRC Files/src/player/skills/EnemySpawn.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,52 +16,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) return;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                              UpdateHUD(player, skillInfo);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                            UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/ExplosiveShot.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -18,24 +17,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -65,28 +46,27 @@ namespace jRandomSkills
             heProjectile.DetonateTime = 0;
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
             if (attackerPawn.DesignerName != "player")
-                return HookResult.Continue;
+                return;
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-            if (playerInfo == null || playerInfo.Skill != skillName) return HookResult.Continue;
+            if (playerInfo == null || playerInfo.Skill != skillName) return;
 
             if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
                 SpawnExplosion(param2.DamagePosition);
-            return HookResult.Continue;
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#9c0000", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float damage = 10f, float damageRadius = 190f, float chanceFrom = .15f, float chanceTo = .3f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/FalconEye.cs

@@ -10,56 +10,40 @@ namespace jRandomSkills
     public class FalconEye : ISkill
     {
         private const Skills skillName = Skills.FalconEye;
-        private static bool blocked = false;
         private static readonly float distance = Config.GetValue<float>(skillName, "distance");
         private static readonly Dictionary<ulong, (uint, CDynamicProp)> cameras = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                blocked = true;
-                foreach (var player in Utilities.GetPlayers())
-                    if (cameras.TryGetValue(player.SteamID, out _))
-                        DisableSkill(player);
+        public static void NewRound()
+        {
+            foreach (var camera in cameras)
+                camera.Value.Item2.Remove();
+            cameras.Clear();
+        }
 
-                foreach (var camera in cameras)
-                    camera.Value.Item2.Remove();
-                cameras.Clear();
-                return HookResult.Continue;
-            });
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                blocked = false;
-                return HookResult.Continue;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return ;
 
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            var pawn = player!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid || pawn.CameraServices == null) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var pawn = player!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid || pawn.CameraServices == null) return HookResult.Continue;
-
-                if (cameras.TryGetValue(player!.SteamID, out var cameraInfo) && cameraInfo.Item1 == pawn.CameraServices.ViewEntity.Raw)
-                    BlockWeapon(player, true);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
+            if (cameras.TryGetValue(player!.SteamID, out var cameraInfo) && cameraInfo.Item1 == pawn.CameraServices.ViewEntity.Raw)
+                BlockWeapon(player, true);
         }
 
         public static void UseSkill(CCSPlayerController player)
         {
             var playerPawn = player.PlayerPawn.Value;
-            if (playerPawn?.CBodyComponent == null || blocked) return;
+            if (playerPawn?.CBodyComponent == null) return;
             ChangeCamera(player);
         }
 
@@ -68,7 +52,7 @@ namespace jRandomSkills
             ChangeCamera(player, true);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
                 if (cameras.TryGetValue(player.SteamID, out var cameraInfo) && cameraInfo.Item2.IsValid)

jRandomSkills - SRC Files/src/player/skills/Flash.cs

@@ -1,9 +1,9 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -15,50 +15,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-            Instance.RegisterListener<OnTick>(UpdateSpeed);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerPawn = player.PlayerPawn.Value;
-                        if (playerPawn == null || !playerPawn.IsValid) continue;
+        public static void PlayerMakeSound(UserMessage um)
+        {
+            var soundevent = um.ReadUInt("soundevent_hash");
+            var userIndex = um.ReadUInt("source_entity_index");
 
-                        playerPawn.VelocityModifier = 1;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-                
-                return HookResult.Continue;
-            });
+            if (userIndex == 0) return;
+            if (!Instance.footstepSoundEvents.Contains(soundevent)) return;
 
-            Instance.HookUserMessage(208, um =>
-            {
-                var soundevent = um.ReadUInt("soundevent_hash");
-                var userIndex = um.ReadUInt("source_entity_index");
+            var player = Utilities.GetPlayers().FirstOrDefault(p => p.Pawn?.Value != null && p.Pawn.Value.IsValid && p.Pawn.Value.Index == userIndex);
+            if (!Instance.IsPlayerValid(player)) return;
 
-                if (userIndex == 0) return HookResult.Continue;
-                if (!Instance.footstepSoundEvents.Contains(soundevent)) return HookResult.Continue;
-                
-                var player = Utilities.GetPlayers().FirstOrDefault(p => p.Pawn?.Value != null && p.Pawn.Value.IsValid && p.Pawn.Value.Index == userIndex);
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                if (player!.Buttons.HasFlag(PlayerButtons.Speed) || player.Buttons.HasFlag(PlayerButtons.Duck))
-                {
-                    um.Recipients.Clear();
-                    return HookResult.Handled;
-                }
-
-                return HookResult.Continue;
-            }, HookMode.Pre);
+            if (player!.Buttons.HasFlag(PlayerButtons.Speed) || player.Buttons.HasFlag(PlayerButtons.Duck))
+                um.Recipients.Clear();
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -85,7 +59,7 @@ namespace jRandomSkills
             playerPawn.VelocityModifier = 1;
         }
 
-        private static void UpdateSpeed()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {

jRandomSkills - SRC Files/src/player/skills/Fortnite.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -23,57 +22,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            Instance.RegisterListener<OnServerPrecacheResources>((ResourceManifest manifest) => manifest.AddResource(propModel));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+            barricades.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) return;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                barricades.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                      SkillPlayerInfo.Remove(player.SteamID);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
-
-            Instance.RegisterListener<OnServerPrecacheResources>((ResourceManifest manifest) =>
-            {
-                manifest.AddResource(propModel);
-            });
-
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -153,19 +119,19 @@ namespace jRandomSkills
             });
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
-            if (string.IsNullOrEmpty(param.Entity.Name)) return HookResult.Continue;
-            if (!param.Entity.Name.StartsWith("FortniteWall")) return HookResult.Continue;
+            if (string.IsNullOrEmpty(param.Entity.Name)) return;
+            if (!param.Entity.Name.StartsWith("FortniteWall")) return;
 
             var box = param.As<CDynamicProp>();
-            if (box == null || !box.IsValid) return HookResult.Continue;
+            if (box == null || !box.IsValid) return;
             box.EmitSound("Wood_Plank.BulletImpact", volume: 1f);
 
             if (barricades.TryGetValue(box.Index, out int health))
@@ -175,7 +141,6 @@ namespace jRandomSkills
                 if (health <= 0) box.Remove();
             }
             else box.Remove();
-            return HookResult.Continue;
         }
 
         public class PlayerSkillInfo

jRandomSkills - SRC Files/src/player/skills/FragileBomb.cs

@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -22,25 +21,21 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                bombHealth = maxBombHealth;
-                plantedC4 = null;
-                triggerC4 = null;
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            bombHealth = maxBombHealth;
+            plantedC4 = null;
+            triggerC4 = null;
+        }
 
-            Instance.RegisterEventHandler<EventBombPlanted>((@event, info) =>
-            {
-                var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                if (plantedBomb == null) return HookResult.Continue;
-                plantedC4 = plantedBomb;
-                CreateTrigger();
-                return HookResult.Continue;
-            });
-
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
+        public static void BombPlanted(EventBombPlanted _)
+        {
+            var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+            if (plantedBomb == null) return;
+            plantedC4 = plantedBomb;
+            CreateTrigger();
         }
 
         private static void CreateTrigger()
@@ -82,38 +77,37 @@ namespace jRandomSkills
             SkillUtils.TerminateRound(CsTeam.CounterTerrorist);
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
 
             if (attackerPawn.DesignerName != "player" || param.DesignerName != "trigger_multiple")
-                return HookResult.Continue;
+                return;
 
             CTriggerMultiple trigger = new(param.Handle);
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null || trigger == null || !trigger.Globalname.StartsWith("planted_bomb_prop_"))
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-            if (playerInfo == null || playerInfo.Skill != skillName) return HookResult.Continue;
+            if (playerInfo == null || playerInfo.Skill != skillName) return;
 
             bombHealth -= (int)param2.TotalledDamage;
             if (bombHealth <= 0)
             {
                 RemoveBomb();
-                return HookResult.Continue;
+                return;
             }
 
             Server.PrintToChatAll($" {ChatColors.Gold}{Localization.GetTranslation("fragilebomb_bomb_health")}: {ChatColors.Red}{bombHealth}{ChatColors.Gold}/{ChatColors.Green}{maxBombHealth}");
-            return HookResult.Continue;
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#5d00ff", CsTeam onlyTeam = CsTeam.CounterTerrorist, bool needsTeammates = false, int maxBombHealth = 1000) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/FriendlyFire.cs

@@ -15,29 +15,27 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var damage = @event.DmgHealth;
-                var victim = @event.Userid;
-                var attacker = @event.Attacker;
-                var weapon = @event.Weapon;
-                HitGroup_t hitgroup = (HitGroup_t)@event.Hitgroup;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var damage = @event.DmgHealth;
+            var victim = @event.Userid;
+            var attacker = @event.Attacker;
+            var weapon = @event.Weapon;
+            HitGroup_t hitgroup = (HitGroup_t)@event.Hitgroup;
 
-                if (nades.Contains(weapon)) return HookResult.Continue;
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
+            if (nades.Contains(weapon)) return;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (playerInfo?.Skill != skillName || attacker!.Team != victim!.Team) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (playerInfo?.Skill != skillName || attacker!.Team != victim!.Team) return;
 
-                Server.ExecuteCommand("mp_autokick 0");
+            Server.ExecuteCommand("mp_autokick 0");
 
-                var pawn = victim.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid) return HookResult.Continue;
-                SkillUtils.AddHealth(pawn, damage + (int)(damage * healthMultiplier), pawn.MaxHealth);
-                
-                return HookResult.Continue;
-            });
+            var pawn = victim.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid) return;
+            SkillUtils.AddHealth(pawn, damage + (int)(damage * healthMultiplier), pawn.MaxHealth);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#ff0000", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = true, float healthMultiplier = 1.5f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/FrozenDecoy.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -18,64 +17,45 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                decoys.Clear();
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            decoys.Clear();
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
+        public static void DecoyStarted(EventDecoyStarted @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            decoys.Add(new Vector(@event.X, @event.Y, @event.Z));
+        }
+
+        public static void DecoyDetonate(EventDecoyDetonate @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            decoys.RemoveAll(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z);
+        }
+
+        public static void OnTick()
+        {
+            foreach (Vector decoyPos in decoys)
+                foreach (var player in Utilities.GetPlayers().Where(p => p.Team == CsTeam.Terrorist || p.Team == CsTeam.CounterTerrorist))
                 {
-                    foreach (var player in Utilities.GetPlayers())
+                    var pawn = player.PlayerPawn.Value;
+                    if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) return;
+                    double distance = SkillUtils.GetDistance(decoyPos, pawn.AbsOrigin);
+                    if (distance <= decoyRadius)
                     {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
+                        double modifier = Math.Clamp(distance / decoyRadius, 0f, 1f);
+                        pawn.VelocityModifier = (float)Math.Pow(modifier, slownessMultiplier);
                     }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventDecoyStarted>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                decoys.Add(new Vector(@event.X, @event.Y, @event.Z));
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventDecoyDetonate>((@event, @info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                decoys.RemoveAll(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (Vector decoyPos in decoys)
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var pawn = player.PlayerPawn.Value;
-                        if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) return;
-                        double distance = SkillUtils.GetDistance(decoyPos, pawn.AbsOrigin);
-                        if (distance <= decoyRadius)
-                        {
-                            double modifier = Math.Clamp(distance / decoyRadius, 0f, 1f);
-                            pawn.VelocityModifier = (float)Math.Pow(modifier, slownessMultiplier);
-                        }
-                    }
-            });
+                }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Gambler.cs

@@ -0,0 +1,112 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using jRandomSkills.src.player;
+using jRandomSkills.src.utils;
+using static jRandomSkills.jRandomSkills;
+
+namespace jRandomSkills
+{
+    public class Gambler : ISkill
+    {
+        private const Skills skillName = Skills.Gambler;
+        private static readonly int refreshPrice = Config.GetValue<int>(skillName, "refreshPrice");
+
+        public static void LoadSkill()
+        {
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
+
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void TypeSkill(CCSPlayerController player, string[] commands)
+        {
+            if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            if (playerInfo.SkillChance == 1)
+            {
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("areareaper_used_info")}");
+                return;
+            }
+
+            var skill = SkillData.Skills.FirstOrDefault(s => s.Name.Equals(commands[0], StringComparison.OrdinalIgnoreCase) || s.Skill.ToString().Equals(commands[0], StringComparison.OrdinalIgnoreCase));
+            if (skill == null)
+            {
+                player.PrintToChat($" {ChatColors.Red}" + Localization.GetTranslation("skill_not_found_setskill"));
+                return;
+            }
+
+            if (skill.Skill == skillName)
+                TakeMoney(player);
+            Instance.AddTimer(.1f, () =>
+            {
+                playerInfo.Skill = skill.Skill;
+                playerInfo.SkillChance = 1;
+                Instance.SkillAction(skill.Skill.ToString(), "EnableSkill", [player]);
+            });
+        }
+
+        private static void TakeMoney(CCSPlayerController player)
+        {
+            if (player == null || !player.IsValid || player.InGameMoneyServices == null) return;
+            var account = player.InGameMoneyServices.Account;
+            player.InGameMoneyServices.Account = Math.Max(0, account - refreshPrice);
+            Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInGameMoneyServices");
+        }
+
+        public static void EnableSkill(CCSPlayerController player)
+        {
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo == null) return;
+            playerInfo.SkillChance = 0;
+
+            var skills = GetSkills(player);
+            var firstSkill = skills[Instance.Random.Next(skills.Count)];
+            skills.Remove(firstSkill);
+            var secondSkill = skills[Instance.Random.Next(skills.Count)];
+
+            HashSet<(string, string)> menuItems = [(firstSkill.Name, firstSkill.Skill.ToString()),
+                                                   (secondSkill.Name, secondSkill.Skill.ToString()),
+                                                    (Localization.GetTranslation("gambler_more"), skillName.ToString())];
+            SkillUtils.CreateMenu(player, menuItems);
+        }
+
+        public static void DisableSkill(CCSPlayerController player)
+        {
+            SkillUtils.CloseMenu(player);
+        }
+
+        private static List<jSkill_SkillInfo> GetSkills(CCSPlayerController player)
+        {
+            var skillPlayer = Instance?.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (skillPlayer == null) return [Event.noneSkill];
+
+            List<jSkill_SkillInfo> skillList = new(SkillData.Skills);
+            skillList.RemoveAll(s => s?.Skill == skillPlayer?.Skill || s?.Skill == skillPlayer?.SpecialSkill || s?.Skill == Skills.None);
+
+            if (Utilities.GetPlayers().FindAll(p => p.Team == player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).Count == 1)
+            {
+                Config.DefaultSkillInfo[] skillsNeedsTeammates = Config.LoadedConfig.SkillsInfo.Where(s => s.NeedsTeammates).ToArray();
+                skillList.RemoveAll(s => skillsNeedsTeammates.Any(s2 => s2.Name == s.Skill.ToString()));
+            }
+
+            if (player.Team == CsTeam.Terrorist)
+                skillList.RemoveAll(s => Event.counterterroristSkills.Any(s2 => s2.Name == s.Skill.ToString()));
+            else
+                skillList.RemoveAll(s => Event.terroristSkills.Any(s2 => s2.Name == s.Skill.ToString()));
+
+            return skillList.Count == 0 ? [Event.noneSkill] : skillList;
+        }
+
+        public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#7eff47", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int refreshPrice = 150) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
+        {
+            public int RefreshPrice { get; set; } = refreshPrice;
+        }
+    }
+}

jRandomSkills - SRC Files/src/player/skills/Ghost.cs

@@ -6,7 +6,6 @@ using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -14,8 +13,6 @@ namespace jRandomSkills
     public class Ghost : ISkill
     {
         private const Skills skillName = Skills.Ghost;
-        private static bool roundEnd = false;
-        private static bool exists = false;
         private static readonly string[] disabledWeapons =
         [
             "weapon_deagle", "weapon_revolver", "weapon_glock", "weapon_usp_silencer",
@@ -36,83 +33,34 @@ namespace jRandomSkills
                 return;
 
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                roundEnd = false;
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SetWeaponAttack(player, false);
+        }
 
-                return HookResult.Continue;
-            });
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) continue;
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        DisableSkill(player);
-                }
-                roundEnd = true;
-                Instance.RemoveListener<CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
+            if (playerInfo?.Skill != skillName) return;
+            SetWeaponVisibility(player!, false);
+            SetWeaponAttack(player!, true);
+        }
 
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null) return HookResult.Continue;
+        public static void WeaponEquip(EventItemEquip @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    DisableSkill(player);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                SetWeaponVisibility(player!, false);
-                SetWeaponAttack(player!, true);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemEquip>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                SetWeaponVisibility(player!, false);
-                SetWeaponAttack(player!, true);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                    SetWeaponAttack(player, false);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(OnTick);
+            if (playerInfo?.Skill != skillName) return;
+            SetWeaponVisibility(player!, false);
+            SetWeaponAttack(player!, true);
         }
 
         public static void CheckTransmit([CastFrom(typeof(nint))] CCheckTransmitInfoList infoList)
@@ -129,10 +77,7 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            if (!exists)
-                Instance.RegisterListener<CheckTransmit>(CheckTransmit);
-            exists = true;
-
+            Event.enableTransmit = true;
             SetPlayerVisibility(player, false);
             SetWeaponVisibility(player, false);
             SetWeaponAttack(player, true);
@@ -146,7 +91,7 @@ namespace jRandomSkills
             invisibleEntities.Remove(player.SteamID);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {
@@ -207,7 +152,7 @@ namespace jRandomSkills
 
         private static void SetWeaponAttack(CCSPlayerController player, bool disableWeapon)
         {
-            if (roundEnd || player == null || !player.IsValid) return;
+            if (player == null || !player.IsValid) return;
             var pawn = player?.PlayerPawn?.Value;
             if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null) return;
 

jRandomSkills - SRC Files/src/player/skills/Glaz.cs

@@ -11,49 +11,26 @@ namespace jRandomSkills
     public class Glaz : ISkill
     {
         private const Skills skillName = Skills.Glaz;
-        private static bool exists = false;
         private readonly static List<int> smokes = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, @info) =>
-            {
-                smokes.Clear();
-                Instance.AddTimer(2f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
+        public static void NewRound()
+        {
+            smokes.Clear();
+        }
 
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-                return HookResult.Continue;
-            });
+        public static void SmokegrenadeDetonate(EventSmokegrenadeDetonate @event)
+        {
+            smokes.Add(@event.Entityid);
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, @info) =>
-            {
-                smokes.Clear();
-                Instance.RemoveListener<Listeners.CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventSmokegrenadeDetonate>((@event, @info) =>
-            {
-                smokes.Add(@event.Entityid);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventSmokegrenadeExpired>((@event, @info) =>
-            {
-                smokes.Remove(@event.Entityid);
-                return HookResult.Continue;
-            });
+        public static void SmokegrenadeExpired(EventSmokegrenadeExpired @event)
+        {
+            smokes.Remove(@event.Entityid);
         }
 
         public static void CheckTransmit([CastFrom(typeof(nint))] CCheckTransmitInfoList infoList)
@@ -74,9 +51,7 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            if (!exists)
-                Instance.RegisterListener<Listeners.CheckTransmit>(CheckTransmit);
-            exists = true;
+            Event.enableTransmit = true;
             SkillUtils.TryGiveWeapon(player, CsItem.SmokeGrenade);
         }
 

jRandomSkills - SRC Files/src/player/skills/Glitch.cs

@@ -14,30 +14,30 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            glitchedPlayers.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in glitchedPlayers)
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -74,24 +74,21 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("glitch") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("glitch_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             player.ReplicateConVar("sv_disable_radar", "0");
             glitchedPlayers.Remove(player);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#f542ef", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Glue.cs

@@ -12,26 +12,26 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterListener<Listeners.OnEntitySpawned>(@event =>
-            {
-                var name = @event.DesignerName;
-                if (!name.EndsWith("_projectile"))
-                    return;
+        public static void OnEntitySpawned(CEntityInstance entity)
+        {
+            var name = entity.DesignerName;
+            if (!name.EndsWith("_projectile"))
+                return;
 
-                var grenade = @event.As<CBaseCSGrenadeProjectile>();
-                if (grenade.OwnerEntity.Value == null || !grenade.OwnerEntity.Value.IsValid) return;
+            var grenade = entity.As<CBaseCSGrenadeProjectile>();
+            if (grenade.OwnerEntity.Value == null || !grenade.OwnerEntity.Value.IsValid) return;
 
-                var pawn = grenade.OwnerEntity.Value.As<CCSPlayerPawn>();
-                if (pawn == null || !pawn.IsValid || pawn.Controller == null || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
+            var pawn = grenade.OwnerEntity.Value.As<CCSPlayerPawn>();
+            if (pawn == null || !pawn.IsValid || pawn.Controller == null || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
 
-                var player = pawn.Controller.Value.As<CCSPlayerController>();
-                if (player == null || !player.IsValid) return;
+            var player = pawn.Controller.Value.As<CCSPlayerController>();
+            if (player == null || !player.IsValid) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return;
-                grenade.Bounces = 555;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            grenade.Bounces = 555;
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#fff52e", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/GodMode.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -18,51 +17,11 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -75,6 +34,17 @@ namespace jRandomSkills
             };
         }
 
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
+            {
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+                if (playerInfo?.Skill == skillName)
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
+        }
+
         public static void DisableSkill(CCSPlayerController player)
         {
             SkillPlayerInfo.Remove(player.SteamID);

jRandomSkills - SRC Files/src/player/skills/HealingSmoke.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -18,84 +17,65 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
+        public static void NewRound()
+        {
+            smokes.Clear();
+        }
+
+        public static void SmokegrenadeDetonate(EventSmokegrenadeDetonate @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            smokes.Add(new Vector(@event.X, @event.Y, @event.Z));
+        }
+
+        public static void SmokegrenadeExpired(EventSmokegrenadeExpired @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            smokes.RemoveAll(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z);
+        }
+
+        public static void OnEntitySpawned(CEntityInstance entity)
+        {
+            var name = entity.DesignerName;
+            if (name != "smokegrenade_projectile") return;
+
+            var grenade = entity.As<CBaseCSGrenadeProjectile>();
+            if (grenade == null || !grenade.IsValid || grenade.OwnerEntity == null || !grenade.OwnerEntity.IsValid || grenade.OwnerEntity.Value == null || !grenade.OwnerEntity.Value.IsValid) return;
+
+            var pawn = grenade.OwnerEntity.Value.As<CCSPlayerPawn>();
+            if (pawn == null || !pawn.IsValid || pawn.Controller == null || !pawn.Controller.IsValid || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
+
+            var player = pawn.Controller.Value.As<CCSPlayerController>();
+            if (player == null || !player.IsValid) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            Server.NextFrame(() =>
             {
-                smokes.Clear();
-                return HookResult.Continue;
+                var smoke = entity.As<CSmokeGrenadeProjectile>();
+                smoke.SmokeColor.X = 0;
+                smoke.SmokeColor.Y = 255;
+                smoke.SmokeColor.Z = 0;
             });
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventSmokegrenadeDetonate>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                smokes.Add(new Vector(@event.X, @event.Y, @event.Z));
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventSmokegrenadeExpired>((@event, @info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                smokes.RemoveAll(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnEntitySpawned>(@event =>
-            {
-                var name = @event.DesignerName;
-                if (name != "smokegrenade_projectile") return;
-
-                var grenade = @event.As<CBaseCSGrenadeProjectile>();
-                if (grenade == null || !grenade.IsValid || grenade.OwnerEntity == null || !grenade.OwnerEntity.IsValid || grenade.OwnerEntity.Value == null || !grenade.OwnerEntity.Value.IsValid) return;
-
-                var pawn = grenade.OwnerEntity.Value.As<CCSPlayerPawn>();
-                if (pawn == null || !pawn.IsValid || pawn.Controller == null || !pawn.Controller.IsValid || pawn.Controller.Value == null || !pawn.Controller.Value.IsValid) return;
-
-                var player = pawn.Controller.Value.As<CCSPlayerController>();
-                if (player == null || !player.IsValid) return;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return;
-
-                Server.NextFrame(() =>
-                {
-                    var smoke = @event.As<CSmokeGrenadeProjectile>();
-                    smoke.SmokeColor.X = 0;
-                    smoke.SmokeColor.Y = 255;
-                    smoke.SmokeColor.Z = 0;
-                });
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (Vector smokePos in smokes)
-                    foreach (var player in Utilities.GetPlayers())
-                        if (Server.TickCount % 17 == 0)
-                            if (player.PlayerPawn.Value != null && player.PlayerPawn.Value.IsValid && player.PlayerPawn.Value.AbsOrigin != null)
-                                if (SkillUtils.GetDistance(smokePos, player.PlayerPawn.Value.AbsOrigin) <= smokeRadius)
-                                    AddHealth(player.PlayerPawn.Value, smokeHeal);
-            });
+        public static void OnTick()
+        {
+            foreach (Vector smokePos in smokes)
+                foreach (var player in Utilities.GetPlayers())
+                    if (Server.TickCount % 17 == 0)
+                        if (player.PlayerPawn.Value != null && player.PlayerPawn.Value.IsValid && player.PlayerPawn.Value.AbsOrigin != null)
+                            if (SkillUtils.GetDistance(smokePos, player.PlayerPawn.Value.AbsOrigin) <= smokeRadius)
+                                AddHealth(player.PlayerPawn.Value, smokeHeal);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Hermit.cs

@@ -11,41 +11,15 @@ namespace jRandomSkills
         private const Skills skillName = Skills.Hermit;
         private static readonly Dictionary<string, int> dictionary = new()
         {
-            { "weapon_glock", 120 },
-            { "weapon_usp_silencer", 24 },
-            { "weapon_hkp2000", 52 },
-            { "weapon_p250", 26 },
-            { "weapon_cz75", 12 },
-            { "weapon_deagle", 35 },
-            { "weapon_fiveseven", 100 },
-            { "weapon_elite", 120 },
-            { "weapon_tec9", 90 },
-            { "weapon_revolver", 8 },
-            { "weapon_mac10", 100 },
-            { "weapon_mp9", 120 },
-            { "weapon_mp7", 120 },
-            { "weapon_mp5", 120 },
-            { "weapon_mp5sd", 120 },
-            { "weapon_ump45", 100 },
-            { "weapon_p90", 100 },
-            { "weapon_bizon", 120 },
-            { "weapon_ak47", 90 },
-            { "weapon_m4a1", 90 },
-            { "weapon_m4a1_silencer", 80 },
-            { "weapon_galilar", 90 },
-            { "weapon_famas", 90 },
-            { "weapon_aug", 90 },
-            { "weapon_sg556", 90 },
-            { "weapon_ssg08", 90 },
-            { "weapon_awp", 30 },
-            { "weapon_scar20", 90 },
-            { "weapon_g3sg1", 90 },
-            { "weapon_nova", 32 },
-            { "weapon_xm1014", 32 },
-            { "weapon_sawedoff", 32 },
-            { "weapon_mag7", 32 },
-            { "weapon_m249", 200 },
-            { "weapon_negev", 300 }
+            { "weapon_glock", 120 }, { "weapon_usp_silencer", 24 }, { "weapon_hkp2000", 52 }, { "weapon_p250", 26 },
+            { "weapon_cz75", 12 }, { "weapon_deagle", 35 }, { "weapon_fiveseven", 100 }, { "weapon_elite", 120 },
+            { "weapon_tec9", 90 }, { "weapon_revolver", 8 }, { "weapon_mac10", 100 }, { "weapon_mp9", 120 },
+            { "weapon_mp7", 120 }, { "weapon_mp5", 120 }, { "weapon_mp5sd", 120 }, { "weapon_ump45", 100 },
+            { "weapon_p90", 100 }, { "weapon_bizon", 120 }, { "weapon_ak47", 90 }, { "weapon_m4a1", 90 },
+            { "weapon_m4a1_silencer", 80 }, { "weapon_galilar", 90 }, { "weapon_famas", 90 }, { "weapon_aug", 90 },
+            { "weapon_sg556", 90 }, { "weapon_ssg08", 90 }, { "weapon_awp", 30 }, { "weapon_scar20", 90 },
+            { "weapon_g3sg1", 90 }, { "weapon_nova", 32 }, { "weapon_xm1014", 32 }, { "weapon_sawedoff", 32 },
+            { "weapon_mag7", 32 }, { "weapon_m249", 200 }, { "weapon_negev", 300 }
         };
         private static readonly Dictionary<string, int> maxReserveAmmo = dictionary;
 
@@ -54,31 +28,29 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                if (!Instance.IsPlayerValid(attacker)) return HookResult.Continue;
+        }
 
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (attackerInfo?.Skill != skillName) return HookResult.Continue;
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var attacker = @event.Attacker;
+            if (!Instance.IsPlayerValid(attacker)) return;
 
-                var pawn = attacker!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null) return HookResult.Continue;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (attackerInfo?.Skill != skillName) return;
 
-                var weapon = pawn.WeaponServices.ActiveWeapon.Value;
-                if (weapon == null || !weapon.IsValid || weapon.VData == null) return HookResult.Continue;
+            var pawn = attacker!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null) return;
 
-                var maxReserveAmmoClip = maxReserveAmmo.TryGetValue(weapon.DesignerName, out var reserve) ? reserve : 100;
-                weapon.Clip1 = weapon.VData.MaxClip1;
-                weapon.ReserveAmmo.Fill(maxReserveAmmoClip);
-                
-                Utilities.SetStateChanged(weapon, "CBasePlayerWeapon", "m_iClip1");
-                Utilities.SetStateChanged(weapon, "CBasePlayerWeapon", "m_pReserveAmmo");
-                SkillUtils.AddHealth(pawn, healthToAdd);
+            var weapon = pawn.WeaponServices.ActiveWeapon.Value;
+            if (weapon == null || !weapon.IsValid || weapon.VData == null) return;
 
-                return HookResult.Continue;
-            });
+            var maxReserveAmmoClip = maxReserveAmmo.TryGetValue(weapon.DesignerName, out var reserve) ? reserve : 100;
+            weapon.Clip1 = weapon.VData.MaxClip1;
+            weapon.ReserveAmmo.Fill(maxReserveAmmoClip);
+
+            Utilities.SetStateChanged(weapon, "CBasePlayerWeapon", "m_iClip1");
+            Utilities.SetStateChanged(weapon, "CBasePlayerWeapon", "m_pReserveAmmo");
+            SkillUtils.AddHealth(pawn, healthToAdd);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#ded678", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int healthToAdd = 25) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/HolyHandGrenade.cs

@@ -16,44 +16,28 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void OnEntitySpawned(CEntityInstance @event)
+        {
+            var name = @event.DesignerName;
+            if (!name.EndsWith("hegrenade_projectile"))
+                return;
+
+            Server.NextFrame(() =>
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                var hegrenade = @event.As<CHEGrenadeProjectile>();
+                if (hegrenade == null || !hegrenade.IsValid) return;
 
-                return HookResult.Continue;
-            });
+                var playerPawn = hegrenade.Thrower.Value;
+                if (playerPawn == null || !playerPawn.IsValid) return;
 
-            Instance.RegisterListener<Listeners.OnEntitySpawned>(@event =>
-            {
-                var name = @event.DesignerName;
-                if (!name.EndsWith("hegrenade_projectile"))
-                    return;
+                var player = Utilities.GetPlayers().FirstOrDefault(p => p.PlayerPawn.Index == playerPawn.Index);
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+                if (playerInfo?.Skill != skillName) return;
 
-                Server.NextFrame(() =>
-                {
-                    var hegrenade = @event.As<CHEGrenadeProjectile>();
-                    if (hegrenade == null || !hegrenade.IsValid) return;
-
-                    var playerPawn = hegrenade.Thrower.Value;
-                    if (playerPawn == null || !playerPawn.IsValid) return;
-
-                    var player = Utilities.GetPlayers().FirstOrDefault(p => p.PlayerPawn.Index == playerPawn.Index);
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                    if (playerInfo?.Skill != skillName) return;
-
-                    hegrenade.Damage *= damageMultiplier;
-                    hegrenade.DmgRadius *= damageRadiusMultiplier;
-                });
+                hegrenade.Damage *= damageMultiplier;
+                hegrenade.DmgRadius *= damageRadiusMultiplier;
             });
         }
 

jRandomSkills - SRC Files/src/player/skills/Impostor.cs

@@ -16,25 +16,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            string model = GetEnemyModel(player);
-                            SetPlayerModel(player, model);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/InfiniteAmmo.cs

@@ -12,48 +12,38 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventWeaponFire>((@event, info) =>
-            {
-                var player = @event.Userid;
+        public static void WeaponFire(EventWeaponFire @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill == skillName)
+                ApplyInfiniteAmmo(player!);
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+        }
 
-                if (playerInfo?.Skill == skillName)
-                    ApplyInfiniteAmmo(player!);
+        public static void GrenadeThrown(EventGrenadeThrown @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-                return HookResult.Continue;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill == skillName)
+                player!.GiveNamedItem($"weapon_{@event.Weapon}");
 
-            Instance.RegisterEventHandler<EventGrenadeThrown>((@event, info) =>
-            {
-                var player = @event.Userid;
+        }
 
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+        public static void WeaponReload(EventWeaponReload @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill == skillName)
-                    player!.GiveNamedItem($"weapon_{@event.Weapon}");
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventWeaponReload>((@event, info) =>
-            {
-                var player = @event.Userid;
-
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill == skillName)
-                    ApplyInfiniteAmmo(player!);
-                
-                return HookResult.Continue;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill == skillName)
+                ApplyInfiniteAmmo(player!);
         }
 
         private static void ApplyInfiniteAmmo(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Jackal.cs

@@ -18,39 +18,20 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var beams in stepBeams.Values)
-                    foreach (var beam in beams)
-                        if (beam != null && beam.IsValid)
-                            beam.Remove();
-                stepBeams.Clear();
-                Instance.RemoveListener<Listeners.CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void NewRound()
+        {
+            foreach (var beams in stepBeams.Values)
+                foreach (var beam in beams)
+                    if (beam != null && beam.IsValid)
+                        beam.Remove();
+            stepBeams.Clear();
+            Instance.RemoveListener<Listeners.CheckTransmit>(CheckTransmit);
+            exists = false;
+        }
+
+        public static void OnTick()
         {
             if (Server.TickCount % 8 != 0) return;
             foreach (var step in stepBeams.ToList())

jRandomSkills - SRC Files/src/player/skills/Jammer.cs

@@ -15,30 +15,31 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in jammedPlayers)
+                SetCrosshair(player, true);
+            jammedPlayers.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in jammedPlayers)
-                    SetCrosshair(player, true);
-                jammedPlayers.Clear();
-                return HookResult.Continue;
-            });
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -85,24 +86,21 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("jammer") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("jammer_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             SetCrosshair(player, true);
             jammedPlayers.Remove(player);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#42f5a7", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Jester.cs

@@ -0,0 +1,123 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using jRandomSkills.src.player;
+using jRandomSkills.src.utils;
+using System.Drawing;
+using static jRandomSkills.jRandomSkills;
+
+namespace jRandomSkills
+{
+    public class Jester : ISkill
+    {
+        private const Skills skillName = Skills.Jester;
+        private static bool jesterMode = false;
+        private static bool jesterStarted = false;
+        private static readonly float minTime = Config.GetValue<float>(skillName, "minTime");
+        private static readonly float maxTime = Config.GetValue<float>(skillName, "maxTime");
+
+        public static void LoadSkill()
+        {
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
+
+        public static void NewRound()
+        {
+            jesterStarted = false;
+        }
+
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            if (!jesterMode) return;
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int hitgroup = @event.Hitgroup;
+
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+
+            if (attackerInfo?.Skill == skillName || victimInfo?.Skill == skillName)
+                RestoreHealth(victim!, @event.DmgHealth);
+        }
+
+        private static void RestoreHealth(CCSPlayerController victim, float damage)
+        {
+            var playerPawn = victim.PlayerPawn.Value;
+            if (playerPawn == null || !playerPawn.IsValid) return;
+            var newHealth = playerPawn.Health + damage;
+
+            if (newHealth > 100)
+                newHealth = 100;
+
+            playerPawn.Health = (int)newHealth;
+        }
+
+        public static void EnableSkill(CCSPlayerController _)
+        {
+            if (!jesterStarted)
+            {
+                float wait = (float)Instance.Random.NextDouble() * (maxTime - minTime) + minTime;
+                Instance.AddTimer(wait, ChangeMode);
+                jesterStarted = true;
+            }
+        }
+
+        private static void ChangeMode()
+        {
+            if (Instance.SkillPlayer.Any(p => p.Skill == skillName))
+            {
+                jesterMode = !jesterMode;
+                foreach (var player in Utilities.GetPlayers().Where(p => !p.IsBot && p.PawnIsAlive))
+                {
+                    if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) continue;
+                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+                    if (playerInfo?.Skill == skillName)
+                    {
+                        SetPlayerColor(player.PlayerPawn.Value);
+                        player.ExecuteClientCommand("play sounds/weapons/taser/taser_charge_ready");
+                    }
+                }
+                float wait = (float)Instance.Random.NextDouble() * (maxTime - minTime) + minTime;
+                Instance.AddTimer(wait, ChangeMode);
+            }
+        }
+
+        private static void SetPlayerColor(CCSPlayerPawn pawn)
+        {
+            var color = jesterMode ? Color.FromArgb(255, 128, 0, 128) : Color.FromArgb(255, 255, 255, 255);
+            pawn.Render = color;
+            Utilities.SetStateChanged(pawn, "CBaseModelEntity", "m_clrRender");
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers().Where(p => !p.IsBot && p.PawnIsAlive))
+            {
+                if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+                if (playerInfo?.Skill == skillName)
+                    UpdateHUD(player);
+            }
+        }
+
+        private static void UpdateHUD(CCSPlayerController player)
+        {
+            var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == skillName);
+            if (skillData == null) return;
+
+            string infoLine = $"<font class='fontSize-l' class='fontWeight-Bold' color='#FFFFFF'>{Localization.GetTranslation("your_skill")}:</font> <br>";
+            string skillLine = $"<font class='fontSize-l' class='fontWeight-Bold' color='{skillData.Color}'>{skillData.Name}</font> <br>";
+            string remainingLine = $"<font class='fontSize-m' color='#FFFFFF'>{Localization.GetTranslation("jester_mode")}: <font color='{(jesterMode ? "#00ff00" : "#ff0000")}'>{Localization.GetTranslation(jesterMode ? "jester_on" : "jester_off")}</font></font> <br>";
+
+            var hudContent = infoLine + skillLine + remainingLine;
+            player.PrintToCenterHtml(hudContent);
+        }
+
+        public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#8f108f", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float minTime = 10f, float maxTime = 25f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
+        {
+            public float MinTime { get; set; } = minTime;
+            public float MaxTime { get; set; } = maxTime;
+        }
+    }
+}

jRandomSkills - SRC Files/src/player/skills/JumpBan.cs

@@ -10,54 +10,50 @@ namespace jRandomSkills
     public class JumpBan : ISkill
     {
         private const Skills skillName = Skills.JumpBan;
-        private static readonly Dictionary<CCSPlayerPawn, int> bannedPlayers = [];
+        public static readonly Dictionary<CCSPlayerPawn, int> bannedPlayers = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                bannedPlayers.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerJump>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return HookResult.Continue;
-                if (!bannedPlayers.TryGetValue(player.PlayerPawn.Value, out _)) return HookResult.Continue;
-                bannedPlayers[player.PlayerPawn.Value] = Server.TickCount + 10;
-                return HookResult.Stop;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void NewRound()
+        {
+            bannedPlayers.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void PlayerJump(EventPlayerJump @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return;
+            if (!bannedPlayers.TryGetValue(player.PlayerPawn.Value, out _)) return;
+            bannedPlayers[player.PlayerPawn.Value] = Server.TickCount + 10;
+        }
+
+        public static void OnTick()
         {
             foreach (var item in bannedPlayers)
             {
                 var pawn = item.Key;
                 var time = item.Value;
                 if (time > Server.TickCount)
-                    pawn.AbsVelocity.Z = -100;
+                    if (pawn != null && pawn.IsValid)
+                        pawn.AbsVelocity.Z = -100;
+            }
+
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
+            {
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
             }
         }
 
@@ -94,24 +90,21 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("jumpban") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("jumpban_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return;
             bannedPlayers.Remove(player.PlayerPawn.Value);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#b01e5d", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/JumpingJack.cs

@@ -13,17 +13,15 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerJump>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                SkillUtils.AddHealth(player.PlayerPawn.Value, addHealth);
-                return HookResult.Continue;
-            });
+        public static void PlayerJump(EventPlayerJump @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+            SkillUtils.AddHealth(player.PlayerPawn.Value, addHealth);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#a86eff", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int healthToAdd = 3) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/KillerFlash.cs

@@ -3,6 +3,7 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
+using Microsoft.Extensions.Logging;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -15,37 +16,19 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        public static void PlayerBlind(EventPlayerBlind @event)
+        {
+            var player = @event.Userid;
+            var attacker = @event.Attacker;
+            if (!Instance.IsPlayerValid(player) || !Instance.IsPlayerValid(attacker)) return;
 
-                return HookResult.Continue;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
 
-            Instance.RegisterEventHandler<EventPlayerBlind>((@event, info) =>
-            {
-                var player = @event.Userid;
-                var attacker = @event.Attacker;
-                if (!Instance.IsPlayerValid(player) || !Instance.IsPlayerValid(attacker)) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                if (attackerInfo?.Skill == skillName && playerInfo?.Skill != Skills.AntyFlash && player!.PlayerPawn.Value!.FlashDuration >= flashDuration)
-                   player?.PlayerPawn?.Value?.CommitSuicide(false, true);
-
-                return HookResult.Continue;
-            });
+            if (attackerInfo?.Skill == skillName && playerInfo?.Skill != Skills.AntyFlash && player!.PlayerPawn.Value!.FlashDuration >= flashDuration)
+                player?.PlayerPawn?.Value?.CommitSuicide(false, true);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/LifeSwap.cs

@@ -13,23 +13,29 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+
+                HashSet<(string, string)> menuItems = enemies.Select(e => ($"{e.PlayerName} : {e.PawnHealth} HP", e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -65,18 +71,14 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("lifeswap") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("lifeswap_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => ($"{e.PlayerName} : {e.PawnHealth} HP", e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         private static void SwapHealth(CCSPlayerController player, CCSPlayerController enemy)
@@ -92,6 +94,11 @@ namespace jRandomSkills
             Utilities.SetStateChanged(enemyPawn, "CBaseEntity", "m_iHealth");
         }
 
+        public static void DisableSkill(CCSPlayerController player)
+        {
+            SkillUtils.CloseMenu(player);
+        }
+
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#a3651a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
         {
         }

jRandomSkills - SRC Files/src/player/skills/LongKnife.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using CS2TraceRay.Class;
@@ -16,52 +15,51 @@ namespace jRandomSkills
         private const Skills skillName = Skills.LongKnife;
         private static readonly float maxDistance = Config.GetValue<float>(skillName, "maxDistance");
 
-        public unsafe static void LoadSkill()
+        public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventWeaponFire>((@event, info) =>
+        public unsafe static void WeaponFire(EventWeaponFire @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            var pawn = player!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null || pawn.WeaponServices == null) return;
+
+            var activeWeapon = pawn.WeaponServices.ActiveWeapon.Value;
+            if (activeWeapon == null || !activeWeapon.IsValid || activeWeapon.DesignerName != "weapon_knife") return;
+
+            Vector eyePos = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z + pawn.ViewOffset.Z);
+            Vector endPos = eyePos + SkillUtils.GetForwardVector(pawn.EyeAngles) * maxDistance;
+
+            Ray ray = new(Vector3.Zero);
+            CTraceFilter filter = new(pawn.Index, pawn.Index)
             {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+                m_nObjectSetMask = 0xf,
+                m_nCollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_PLAYER_MOVEMENT,
+                m_nInteractsWith = pawn.GetInteractsWith(),
+                m_nInteractsExclude = 0,
+                m_nBits = 11,
+                m_bIterateEntities = true,
+                m_bHitTriggers = false,
+                m_nInteractsAs = 0x40000
+            };
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
+            filter.m_nHierarchyIds[0] = pawn.GetHierarchyId();
+            filter.m_nHierarchyIds[1] = 0;
+            CGameTrace trace = TraceRay.TraceHull(eyePos, endPos, filter, ray);
 
-                var pawn = player!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null || pawn.WeaponServices == null) return HookResult.Continue;
+            if (!trace.HitPlayer(out CCSPlayerController? target) || target == null)
+                return;
 
-                var activeWeapon = pawn.WeaponServices.ActiveWeapon.Value;
-                if (activeWeapon == null || !activeWeapon.IsValid || activeWeapon.DesignerName != "weapon_knife") return HookResult.Continue;
-
-                Vector eyePos = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z + pawn.ViewOffset.Z);
-                Vector endPos = eyePos + SkillUtils.GetForwardVector(pawn.EyeAngles) * maxDistance;
-
-                Ray ray = new(Vector3.Zero);
-                CTraceFilter filter = new(pawn.Index, pawn.Index)
-                {
-                    m_nObjectSetMask = 0xf,
-                    m_nCollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_PLAYER_MOVEMENT,
-                    m_nInteractsWith = pawn.GetInteractsWith(),
-                    m_nInteractsExclude = 0,
-                    m_nBits = 11,
-                    m_bIterateEntities = true,
-                    m_bHitTriggers = false,
-                    m_nInteractsAs = 0x40000
-                };
-
-                filter.m_nHierarchyIds[0] = pawn.GetHierarchyId();
-                filter.m_nHierarchyIds[1] = 0;
-                CGameTrace trace = TraceRay.TraceHull(eyePos, endPos, filter, ray);
-
-                if (!trace.HitPlayer(out CCSPlayerController? target) || target == null)
-                    return HookResult.Continue;
-
-                if (target.Handle == player.Handle || target.PlayerPawn.Value == null || !target.PlayerPawn.Value.IsValid || trace.Distance() <= 70) return HookResult.Continue;
-                target.PlayerPawn.Value.EmitSound("Player.DamageBody.Onlooker");
-                SkillUtils.TakeHealth(target.PlayerPawn.Value, Instance.Random.Next(21, 34));
-                return HookResult.Continue;
-            });
+            if (target.Handle == player.Handle || target.PlayerPawn.Value == null || !target.PlayerPawn.Value.IsValid || trace.Distance() <= 70) return;
+            target.PlayerPawn.Value.EmitSound("Player.DamageBody.Onlooker");
+            SkillUtils.TakeHealth(target.PlayerPawn.Value, Instance.Random.Next(21, 34));
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#c9f8ff", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float maxDistance = 4096f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/LongZeus.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using CS2TraceRay.Class;
@@ -16,67 +15,50 @@ namespace jRandomSkills
         private const Skills skillName = Skills.LongZeus;
         private static readonly float maxDistance = Config.GetValue<float>(skillName, "maxDistance");
 
-        public unsafe static void LoadSkill()
+        public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public unsafe static void WeaponFire(EventWeaponFire @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            var pawn = player!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null || pawn.WeaponServices == null) return;
+
+            var activeWeapon = pawn.WeaponServices.ActiveWeapon.Value;
+            if (activeWeapon == null || !activeWeapon.IsValid || activeWeapon.DesignerName != "weapon_taser") return;
+
+            Vector eyePos = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z + pawn.ViewOffset.Z);
+            Vector endPos = eyePos + SkillUtils.GetForwardVector(pawn.EyeAngles) * maxDistance;
+
+            Ray ray = new(Vector3.Zero);
+            CTraceFilter filter = new(pawn.Index, pawn.Index)
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                m_nObjectSetMask = 0xf,
+                m_nCollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_PLAYER_MOVEMENT,
+                m_nInteractsWith = pawn.GetInteractsWith(),
+                m_nInteractsExclude = 0,
+                m_nBits = 11,
+                m_bIterateEntities = true,
+                m_bHitTriggers = false,
+                m_nInteractsAs = 0x40000
+            };
 
-                return HookResult.Continue;
-            });
+            filter.m_nHierarchyIds[0] = pawn.GetHierarchyId();
+            filter.m_nHierarchyIds[1] = 0;
+            CGameTrace trace = TraceRay.TraceHull(eyePos, endPos, filter, ray);
 
-            Instance.RegisterEventHandler<EventWeaponFire>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            if (!trace.HitPlayer(out CCSPlayerController? target) || target == null)
+                return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var pawn = player!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null || pawn.WeaponServices == null) return HookResult.Continue;
-
-                var activeWeapon = pawn.WeaponServices.ActiveWeapon.Value;
-                if (activeWeapon == null || !activeWeapon.IsValid || activeWeapon.DesignerName != "weapon_taser") return HookResult.Continue;
-
-                Vector eyePos = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z + pawn.ViewOffset.Z);
-                Vector endPos = eyePos + SkillUtils.GetForwardVector(pawn.EyeAngles) * maxDistance;
-
-                Ray ray = new(Vector3.Zero);
-                CTraceFilter filter = new(pawn.Index, pawn.Index)
-                {
-                    m_nObjectSetMask = 0xf,
-                    m_nCollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_PLAYER_MOVEMENT,
-                    m_nInteractsWith = pawn.GetInteractsWith(),
-                    m_nInteractsExclude = 0,
-                    m_nBits = 11,
-                    m_bIterateEntities = true,
-                    m_bHitTriggers = false,
-                    m_nInteractsAs = 0x40000
-                };
-
-                filter.m_nHierarchyIds[0] = pawn.GetHierarchyId();
-                filter.m_nHierarchyIds[1] = 0;
-                CGameTrace trace = TraceRay.TraceHull(eyePos, endPos, filter, ray);
-
-                if (!trace.HitPlayer(out CCSPlayerController? target) || target == null)
-                    return HookResult.Continue;
-
-                if (target.Handle == player.Handle) return HookResult.Continue;
-                SkillUtils.TakeHealth(target.PlayerPawn.Value, 9999);
-                return HookResult.Continue;
-            });
+            if (target.Handle == player.Handle) return;
+            SkillUtils.TakeHealth(target.PlayerPawn.Value, 9999);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Magnifier.cs

@@ -15,30 +15,30 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            playersFOV.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in playersFOV.Keys)
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -79,18 +79,14 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("magnifier") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("magnifier_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -101,6 +97,7 @@ namespace jRandomSkills
                 Utilities.SetStateChanged(player, "CBasePlayerController", "m_iDesiredFOV");
             }
             playersFOV.Remove(player);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#9ba882", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, uint customFOV = 50) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Medic.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -19,49 +18,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) return;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                      SkillPlayerInfo.Remove(player.SteamID);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/MoneySwap.cs

@@ -13,23 +13,29 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+
+                HashSet<(string, string)> menuItems = enemies.Select(e => ($"{e.PlayerName} : {(e.InGameMoneyServices == null ? 0 : e.InGameMoneyServices.Account)}$", e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -65,19 +71,14 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("moneyswap") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("moneyswap_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    if (enemy != null && enemy.IsValid && enemy.InGameMoneyServices != null)
-                        player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}: ${enemy.InGameMoneyServices.Account}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => ($"{e.PlayerName} : {(e.InGameMoneyServices == null ? 0 : e.InGameMoneyServices.Account)}$", e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         private static void SwapMoney(CCSPlayerController player, CCSPlayerController enemy)
@@ -96,6 +97,11 @@ namespace jRandomSkills
             Utilities.SetStateChanged(enemy, "CCSPlayerController", "m_pInGameMoneyServices");
         }
 
+        public static void DisableSkill(CCSPlayerController player)
+        {
+            SkillUtils.CloseMenu(player);
+        }
+
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#52f54c", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
         {
         }

jRandomSkills - SRC Files/src/player/skills/Muhammed.cs

@@ -1,7 +1,9 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
+using Microsoft.Extensions.Logging;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -15,18 +17,16 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!IsDeadPlayerValid(player)) return HookResult.Continue;
+        }
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    SpawnExplosion(player!);
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (!IsDeadPlayerValid(player)) return;
 
-                return HookResult.Continue;
-            });
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill == skillName)
+                SpawnExplosion(player!);
         }
 
         private static void SpawnExplosion(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Ninja.cs

@@ -4,7 +4,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -12,7 +11,6 @@ namespace jRandomSkills
     public class Ninja : ISkill
     {
         private const Skills skillName = Skills.Ninja;
-        private static bool exists = false;
         private static readonly float idlePercentInvisibility = Config.GetValue<float>(skillName, "idlePercentInvisibility");
         private static readonly float duckPercentInvisibility = Config.GetValue<float>(skillName, "duckPercentInvisibility");
         private static readonly float knifePercentInvisibility = Config.GetValue<float>(skillName, "knifePercentInvisibility");
@@ -22,83 +20,31 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        DisableSkill(player);
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerPawn = player.PlayerPawn?.Value;
+        public static void NewRound()
+        {
+            invisibilityChanged.Clear();
+        }
 
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        public static void WeaponEquip(EventItemEquip @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
 
-                return HookResult.Continue;
-            });
+            if (playerInfo?.Skill != skillName) return;
+            UpdateNinja(player);
+        }
 
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                    DisableSkill(player);
-                invisibilityChanged.Clear();
-                return HookResult.Continue;
-            });
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
 
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    DisableSkill(player);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                UpdateNinja(player);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemEquip>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-                UpdateNinja(player);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) continue;
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        DisableSkill(player);
-                }
-                Instance.RemoveListener<CheckTransmit>(CheckTransmit);
-                exists = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(OnTick);
+            if (playerInfo?.Skill != skillName) return;
+            UpdateNinja(player);
         }
 
         public static void CheckTransmit([CastFrom(typeof(nint))] CCheckTransmitInfoList infoList)
@@ -113,7 +59,7 @@ namespace jRandomSkills
             }
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {
@@ -123,11 +69,9 @@ namespace jRandomSkills
             }
         }
 
-        public static void EnableSkill(CCSPlayerController player)
+        public static void EnableSkill(CCSPlayerController _)
         {
-            if (!exists)
-                Instance.RegisterListener<CheckTransmit>(CheckTransmit);
-            exists = true;
+            Event.enableTransmit = true;
         }
         
         public static void DisableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/NoNades.cs

@@ -12,25 +12,20 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var damage = @event.DmgHealth;
-                var player = @event.Userid;
-                var weapon = @event.Weapon;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var damage = @event.DmgHealth;
+            var player = @event.Userid;
+            var weapon = @event.Weapon;
 
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                if (weapon == "hegrenade" || weapon == "inferno")
-                {
-                    SkillUtils.AddHealth(player!.PlayerPawn.Value, damage);
-                    damage = 0;
-                    return HookResult.Stop;
-                }
-                return HookResult.Continue;
-            });
+            if (weapon == "hegrenade" || weapon == "inferno")
+                SkillUtils.AddHealth(player!.PlayerPawn.Value, damage);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#a38c1a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/NoRecoil.cs

@@ -2,7 +2,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -14,43 +13,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                Server.ExecuteCommand("weapon_accuracy_nospread 0");
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(OnTick);
         }
 
-        public static void EnableSkill(CCSPlayerController player)
-        {
-            Server.ExecuteCommand("weapon_accuracy_nospread 1");
-        }
-
-        public static void DisableSkill(CCSPlayerController player)
+        public static void NewRound()
         {
             Server.ExecuteCommand("weapon_accuracy_nospread 0");
         }
 
-        private static void OnTick()
+        public static void EnableSkill(CCSPlayerController _)
+        {
+            Server.ExecuteCommand("weapon_accuracy_nospread 1");
+        }
+
+        public static void DisableSkill(CCSPlayerController _)
+        {
+            Server.ExecuteCommand("weapon_accuracy_nospread 0");
+        }
+
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {

jRandomSkills - SRC Files/src/player/skills/Noclip.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -18,51 +17,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                     SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                              UpdateHUD(player, skillInfo);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/None.cs

@@ -12,11 +12,8 @@ namespace jRandomSkills
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
         }
 
-        public class SkillConfig : Config.DefaultSkillInfo
+        public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#FFFFFF", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
         {
-            public SkillConfig(Skills skill = skillName, bool active = true, string color = "#FFFFFF", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : base(skill, active, color, onlyTeam, needsTeammates)
-            {
-            }
         }
     }
 }

jRandomSkills - SRC Files/src/player/skills/OneShot.cs

@@ -1,5 +1,4 @@
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -14,35 +13,33 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new CCSPlayerPawn(param2.Attacker.Value.Handle);
             CCSPlayerPawn victimPawn = new CCSPlayerPawn(param.Handle);
 
             if (attackerPawn.DesignerName != "player" || victimPawn.DesignerName != "player")
-                return HookResult.Continue;
+                return;
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null || victimPawn == null || victimPawn.Controller?.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
             CCSPlayerController victim = victimPawn.Controller.Value.As<CCSPlayerController>();
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-            if (playerInfo == null) return HookResult.Continue;
+            if (playerInfo == null) return;
 
             if (playerInfo.Skill == skillName && attacker.PawnIsAlive)
                 param2.Damage = 1000f;
-            return HookResult.Changed;
         }
 
         public class SkillConfig : Config.DefaultSkillInfo

jRandomSkills - SRC Files/src/player/skills/OnlyHead.cs

@@ -13,23 +13,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-                var hitgroup = (HitGroup_t)@event.Hitgroup;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
+            var hitgroup = (HitGroup_t)@event.Hitgroup;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return;
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (victimInfo == null || victimInfo.Skill != skillName) return;
 
-                HitGroup_t[] disabledHitbox = [HitGroup_t.HITGROUP_LEFTARM, HitGroup_t.HITGROUP_RIGHTARM, HitGroup_t.HITGROUP_LEFTLEG, HitGroup_t.HITGROUP_RIGHTLEG];
-                if (hitgroup != HitGroup_t.HITGROUP_HEAD)
-                    RestoreHealth(victim!, damage);
-                return HookResult.Stop;
-            });
+            HitGroup_t[] disabledHitbox = [HitGroup_t.HITGROUP_LEFTARM, HitGroup_t.HITGROUP_RIGHTARM, HitGroup_t.HITGROUP_LEFTLEG, HitGroup_t.HITGROUP_RIGHTLEG];
+            if (hitgroup != HitGroup_t.HITGROUP_HEAD)
+                RestoreHealth(victim!, damage);
         }
 
         private static void RestoreHealth(CCSPlayerController victim, float damage)

jRandomSkills - SRC Files/src/player/skills/PawelJumper.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -21,19 +20,17 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-            
-            Instance.RegisterListener<OnTick>(() =>
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) return;
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                    {
-                        GiveAdditionalJump(player);
-                    }
-                }
-            });
+                if (!Instance.IsPlayerValid(player)) return;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+                if (playerInfo?.Skill == skillName)
+                    GiveAdditionalJump(player);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Phoenix.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -14,42 +13,23 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill == skillName)
             {
-                Instance.AddTimer(0.1f, () =>
+                if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
                 {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!IsDeadPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                {
-                    if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
-                    {
-                        player.Respawn();
-                        Instance.AddTimer(.2f, () => player.Respawn());
-                        SkillUtils.PrintToChat(player, Localization.GetTranslation("phoenix_respawn"), false); ;
-                    }
+                    player.Respawn();
+                    Instance.AddTimer(.2f, () => player.Respawn());
+                    SkillUtils.PrintToChat(player, Localization.GetTranslation("phoenix_respawn"), false); ;
                 }
-
-                return HookResult.Continue;
-            });
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Pilot.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,42 +16,21 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
+        }
 
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            PlayerPilotInfo.Clear();
+        }
 
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                     PlayerPilotInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        HandlePilot(player);
-                }
-            });
+                    HandlePilot(player);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Planter.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -16,33 +15,19 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundStart>((@event, @info) =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    if (!Instance.IsPlayerValid(player)) continue;
-                    Schema.SetSchemaValue<bool>(player!.PlayerPawn!.Value!.Handle, "CCSPlayerPawn", "m_bInBombZone", false);
-                }
-                return HookResult.Continue;
-            });
+        public static void BombPlanted(EventBombPlanted @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-            Instance.RegisterEventHandler<EventBombPlanted>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                if (plantedBomb != null)
-                    Server.NextFrame(() => plantedBomb.C4Blow = (float)Server.EngineTime + extraC4BlowTime);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(OnTick);
+            var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+            if (plantedBomb != null)
+                Server.NextFrame(() => plantedBomb.C4Blow = (float)Server.EngineTime + extraC4BlowTime);
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -51,7 +36,7 @@ namespace jRandomSkills
             Schema.SetSchemaValue<bool>(player!.PlayerPawn.Value!.Handle, "CCSPlayerPawn", "m_bInBombZone", false);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {

jRandomSkills - SRC Files/src/player/skills/Poison.cs

@@ -17,41 +17,36 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                foreach (var player in poisonedPlayers)
-                    DisableSkill(player);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void NewRound()
         {
-            if (Server.TickCount % (int)(64 * cooldown) != 0) return;
-            foreach (var player in poisonedPlayers)
+            poisonedPlayers.Clear();
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % (int)(64 * cooldown) == 0)
             {
-                var pawn = player.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid) continue;
-                SkillUtils.TakeHealth(pawn, healthToDamage);
+                foreach (var player in poisonedPlayers)
+                {
+                    var pawn = player.PlayerPawn.Value;
+                    if (pawn == null || !pawn.IsValid) continue;
+                    SkillUtils.TakeHealth(pawn, healthToDamage);
+                }
+            }
+
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
+            {
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
             }
         }
 
@@ -88,23 +83,20 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("poison") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("poison_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             poisonedPlayers.Remove(player);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#902eff", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float cooldown = 1, int damage = 1) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/PrimaryBan.cs

@@ -20,38 +20,38 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            bannedPlayers.Clear();
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
+        }
+
+        public static void WeaponEquip(EventItemEquip @event)
+        {
+            var player = @event.Userid;
+            var weapon = @event.Item;
+            if (player == null || !player.IsValid) return;
+            if (!bannedPlayers.Contains(player.SteamID) || !disabledWeapons.Contains(weapon)) return;
+            player.ExecuteClientCommand("slot3");
+        }
+
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                bannedPlayers.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemEquip>((@event, info) =>
-            {
-                var player = @event.Userid;
-                var weapon = @event.Item;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                if (!bannedPlayers.Contains(player.SteamID) || !disabledWeapons.Contains(weapon)) return HookResult.Continue;
-                player.ExecuteClientCommand("slot3");
-                return HookResult.Stop;
-            });
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.UpdateMenu(player, menuItems);
+            }
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -98,23 +98,20 @@ namespace jRandomSkills
             if (playerInfo == null) return;
             playerInfo.SkillChance = 0;
 
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("primaryban") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("primaryban_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
-                foreach (var enemy in enemies)
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
+                HashSet<(string, string)> menuItems = enemies.Select(e => (e.PlayerName, e.Index.ToString())).ToHashSet();
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
         {
             bannedPlayers.Remove(player.SteamID);
+            SkillUtils.CloseMenu(player);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#ffc061", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Prosthesis.cs

@@ -13,23 +13,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-                var hitgroup = (HitGroup_t)@event.Hitgroup;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
+            var hitgroup = (HitGroup_t)@event.Hitgroup;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return;
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (victimInfo == null || victimInfo.Skill != skillName) return;
 
-                HitGroup_t[] disabledHitbox = [HitGroup_t.HITGROUP_LEFTARM, HitGroup_t.HITGROUP_RIGHTARM, HitGroup_t.HITGROUP_LEFTLEG, HitGroup_t.HITGROUP_RIGHTLEG];
-                if (disabledHitbox.Contains(hitgroup))
-                    RestoreHealth(victim!, damage);
-                return HookResult.Stop;
-            });
+            HitGroup_t[] disabledHitbox = [HitGroup_t.HITGROUP_LEFTARM, HitGroup_t.HITGROUP_RIGHTARM, HitGroup_t.HITGROUP_LEFTLEG, HitGroup_t.HITGROUP_RIGHTLEG];
+            if (disabledHitbox.Contains(hitgroup))
+                RestoreHealth(victim!, damage);
         }
 
         private static void RestoreHealth(CCSPlayerController victim, float damage)

jRandomSkills - SRC Files/src/player/skills/PsychicDefusing.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -20,90 +19,70 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+            bombLocation = null;
+        }
+
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+
+            var pawn = player.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill == skillName)
+                SkillPlayerInfo.Remove(pawn);
+        }
+
+        public static void BombPlanted(EventBombPlanted _)
+        {
+            var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+            if (plantedBomb != null)
+                bombLocation = plantedBomb.AbsOrigin;
+        }
+
+        public static void OnTick()
+        {
+            if (bombLocation == null) return;
+            foreach (var skillInfo in SkillPlayerInfo)
             {
-                Instance.AddTimer(0.1f, () =>
+                var player = skillInfo.Key;
+                var info = skillInfo.Value;
+
+                if (player.AbsOrigin == null || SkillUtils.GetDistance(player.AbsOrigin, bombLocation) > maxDefusingRange)
                 {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                bombLocation = null;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-
-                var pawn = player.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(pawn);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventBombPlanted>((@event, info) =>
-            {
-                var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                if (plantedBomb != null)
-                    bombLocation = plantedBomb.AbsOrigin;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                if (bombLocation == null) return;
-                foreach (var skillInfo in SkillPlayerInfo)
-                {
-                    var player = skillInfo.Key;
-                    var info = skillInfo.Value;
-
-                    if (player.AbsOrigin == null || SkillUtils.GetDistance(player.AbsOrigin, bombLocation) > maxDefusingRange)
-                    {
-                        info.Defusing = false;
-                        info.DefusingTime = defusingTime;
-                        continue;
-                    }
-
-                    if (!info.Defusing)
-                        player.EmitSound("c4.disarmstart");
-                    info.Defusing = true;
-                    info.DefusingTime -= (1f / tickRate);
-
-                    if (info.DefusingTime <= 0)
-                    {
-                        var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                        if (plantedBomb != null)
-                        {
-                            plantedBomb.Remove();
-                            SkillUtils.TerminateRound(CsTeam.CounterTerrorist);
-                        }
-
-                        SkillPlayerInfo.Clear();
-                    }
-
-                    var playerController = player.Controller.Value;
-                    if (playerController == null || !player.Controller.IsValid) return;
-                    UpdateHUD(playerController.As<CCSPlayerController>(), info);
+                    info.Defusing = false;
+                    info.DefusingTime = defusingTime;
+                    continue;
                 }
-            });
+
+                if (!info.Defusing)
+                    player.EmitSound("c4.disarmstart");
+                info.Defusing = true;
+                info.DefusingTime -= (1f / tickRate);
+
+                if (info.DefusingTime <= 0)
+                {
+                    var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+                    if (plantedBomb != null)
+                    {
+                        plantedBomb.Remove();
+                        SkillUtils.TerminateRound(CsTeam.CounterTerrorist);
+                    }
+
+                    SkillPlayerInfo.Clear();
+                }
+
+                var playerController = player.Controller.Value;
+                if (playerController == null || !player.Controller.IsValid) return;
+                UpdateHUD(playerController.As<CCSPlayerController>(), info);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Push.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -16,42 +15,23 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim)
+                return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+
+            if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event!.Attacker;
-                var victim = @event!.Userid;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) 
-                    return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                if (playerInfo?.Skill == skillName && victim!.PawnIsAlive)
-                {
-                    if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
-                        PushEnemy(victim, attacker!.PlayerPawn.Value!.EyeAngles);
-                }
-                
-                return HookResult.Continue;
-            });
+                if (Instance.Random.NextDouble() <= playerInfo.SkillChance)
+                    PushEnemy(victim, attacker!.PlayerPawn.Value!.EyeAngles);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Pyro.cs

@@ -15,36 +15,19 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
+            string weapon = @event.Weapon;
 
-                return HookResult.Continue;
-            });
+            if (weapon != "inferno" || !Instance.IsPlayerValid(victim)) return;
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (victimInfo == null || victimInfo.Skill != skillName) return ;
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-                string weapon = @event.Weapon;
-
-                if (weapon != "inferno" || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
-
-                RestoreHealth(victim!, damage * regenerationMultiplier);
-                return HookResult.Stop;
-            });
+            RestoreHealth(victim!, damage * regenerationMultiplier);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/QuickShot.cs

@@ -2,7 +2,6 @@
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -14,10 +13,9 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            Instance.RegisterListener<OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {

jRandomSkills - SRC Files/src/player/skills/RadarHack.cs

@@ -2,7 +2,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -14,10 +13,9 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            Instance.RegisterListener<OnTick>(CheckRadarowiec);
         }
 
-        private static void CheckRadarowiec()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
             {

jRandomSkills - SRC Files/src/player/skills/Rambo.cs

@@ -15,21 +15,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () => 
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/RandomWeapon.cs

@@ -4,7 +4,6 @@ using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
 using System.Collections.Immutable;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -26,51 +25,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/ReZombie.cs

@@ -16,51 +16,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-
-            Instance.RegisterEventHandler<EventItemEquip>((@event, info) =>
-            {
-                var player = @event.Userid;
-                var weapon = @event.Item;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                if (!zombies.Contains(player) || weapon == "c4") return HookResult.Continue;
-                player.ExecuteClientCommand("slot3");
-                return HookResult.Stop;
-            });
-
-            Instance.RegisterEventHandler<EventRoundStart>((@event, info) =>
-            {
-                foreach(var player in  zombies)
-                    DisableSkill(player);
-                zombies.Clear();
-                return HookResult.Stop;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid || zombies.Contains(player)) return HookResult.Continue;
-
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var pawn = player.PlayerPawn.Value;
-                if (pawn.AbsOrigin == null) return HookResult.Continue;
-                Vector deadPosition = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z);
-                QAngle deadRotation = new(pawn.EyeAngles.X, pawn.EyeAngles.Y, pawn.EyeAngles.Z);
-
-                player.Respawn();
-                Instance.AddTimer(.2f, () => {
-                    player.Respawn();
-                    zombies.Add(player);
-                    SetPlayerColor(pawn, false);
-                    SkillUtils.AddHealth(pawn, zombieHealth - 100, zombieHealth);
-                    pawn.Teleport(deadPosition, deadRotation);
-                    player.ExecuteClientCommand("slot3");
-                    Instance.AddTimer(1, () => player.ExecuteClientCommand("slot3"));
-                });
-
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -75,6 +30,47 @@ namespace jRandomSkills
             SetPlayerColor(player.PlayerPawn.Value, true);
         }
 
+        public static void WeaponEquip(EventItemEquip @event)
+        {
+            var player = @event.Userid;
+            var weapon = @event.Item;
+            if (player == null || !player.IsValid) return;
+            if (!zombies.Contains(player) || weapon == "c4") return;
+            player.ExecuteClientCommand("slot3");
+        }
+
+        public static void NewRound()
+        {
+            foreach (var player in zombies)
+                DisableSkill(player);
+            zombies.Clear();
+        }
+
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid || zombies.Contains(player)) return;
+
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill != skillName) return;
+
+            var pawn = player.PlayerPawn.Value;
+            if (pawn.AbsOrigin == null) return;
+            Vector deadPosition = new(pawn.AbsOrigin.X, pawn.AbsOrigin.Y, pawn.AbsOrigin.Z);
+            QAngle deadRotation = new(pawn.EyeAngles.X, pawn.EyeAngles.Y, pawn.EyeAngles.Z);
+
+            player.Respawn();
+            Instance.AddTimer(.2f, () => {
+                player.Respawn();
+                zombies.Add(player);
+                SetPlayerColor(pawn, false);
+                SkillUtils.AddHealth(pawn, zombieHealth - 100, zombieHealth);
+                pawn.Teleport(deadPosition, deadRotation);
+                player.ExecuteClientCommand("slot3");
+                Instance.AddTimer(1, () => player.ExecuteClientCommand("slot3"));
+            });
+        }
+
         private static void SetPlayerColor(CCSPlayerPawn pawn, bool normal)
         {
             var color = normal ? Color.FromArgb(255, 255, 255, 255) : Color.FromArgb(255, 255, 0, 0);

jRandomSkills - SRC Files/src/player/skills/ReactiveArmor.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,68 +16,38 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                      SkillPlayerInfo.Remove(player.SteamID);
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
+        }
 
-                return HookResult.Continue;
-            });
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
 
-            Instance.RegisterListener<OnTick>(() =>
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return;
+            if (SkillPlayerInfo.TryGetValue(victim!.SteamID, out var skillInfo))
             {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
-
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                if (SkillPlayerInfo.TryGetValue(victim!.SteamID, out var skillInfo))
-                {
-                    if (!victim.IsValid || !victim.PawnIsAlive || !skillInfo.CanUse) return HookResult.Continue;
-                    skillInfo.CanUse = false;
-                    skillInfo.Cooldown = DateTime.Now;
-                    RestoreHealth(victim, damage);
-                    return HookResult.Stop;
-                }
-
-                return HookResult.Continue;
-            });
+                if (!victim.IsValid || !victim.PawnIsAlive || !skillInfo.CanUse) return;
+                skillInfo.CanUse = false;
+                skillInfo.Cooldown = DateTime.Now;
+                RestoreHealth(victim, damage);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Regeneration.cs

@@ -1,5 +1,4 @@
 using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using static jRandomSkills.jRandomSkills;
@@ -15,10 +14,9 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             if (Server.TickCount % (int)(64 * cooldown) != 0) return;
             foreach (var player in Utilities.GetPlayers())

jRandomSkills - SRC Files/src/player/skills/Replicator.cs

@@ -1,11 +1,9 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -19,51 +17,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) return;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
-
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -144,27 +113,26 @@ namespace jRandomSkills
             replica.AcceptInput("EnableCollision");
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
-            if (string.IsNullOrEmpty(param.Entity.Name)) return HookResult.Continue;
-            if (!param.Entity.Name.StartsWith("Replica_")) return HookResult.Continue;
+            if (string.IsNullOrEmpty(param.Entity.Name)) return;
+            if (!param.Entity.Name.StartsWith("Replica_")) return;
 
             var replica = param.As<CPhysicsPropMultiplayer>();
-            if (replica == null || !replica.IsValid) return HookResult.Continue;
+            if (replica == null || !replica.IsValid) return;
             replica.EmitSound("GlassBottle.BulletImpact", volume: 1f);
             
             var attackerTeam = attackerPawn.TeamNum;
             var replicaTeam = replica.Globalname.EndsWith("CT") ? 3 : 2;
             SkillUtils.TakeHealth(attackerPawn, attackerTeam != replicaTeam ? 15 : 5);
             replica.Remove();
-            return HookResult.Continue;
         }
 
         public class PlayerSkillInfo

jRandomSkills - SRC Files/src/player/skills/Retreat.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,51 +16,22 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/ReturnToSender.cs

@@ -14,32 +14,30 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                playersToSender.Clear();
-                return HookResult.Continue;
-            });
+        public static void NewRound()
+        {
+            playersToSender.Clear();
+        }
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (attackerInfo == null || attackerInfo.Skill != skillName) return HookResult.Continue;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (attackerInfo == null || attackerInfo.Skill != skillName) return;
 
-                if (playersToSender.TryGetValue(victim!.Handle, out _))
-                    return HookResult.Continue;
+            if (playersToSender.TryGetValue(victim!.Handle, out _))
+                return;
 
-                var spawn = GetSpawnVector(victim);
-                if (spawn == null) return HookResult.Continue;
-                victim!.PlayerPawn!.Value!.Teleport(spawn);
-                playersToSender.Add(victim.Handle);
-                return HookResult.Stop;
-            });
+            var spawn = GetSpawnVector(victim);
+            if (spawn == null) return;
+            victim!.PlayerPawn!.Value!.Teleport(spawn);
+            playersToSender.Add(victim.Handle);
         }
 
         public static void DisableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/RichBoy.cs

@@ -15,25 +15,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            int moneyBonus = Instance.Random.Next(minMoney, maxMoney);
-                            playerInfo.SkillChance = moneyBonus;
-                            AddMoney(player, moneyBonus);
-                        }
-                    }
-                });
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -50,6 +31,7 @@ namespace jRandomSkills
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
             if (playerInfo == null) return;
             AddMoney(player, -(int)(playerInfo.SkillChance ?? 0));
+            playerInfo.SkillChance = 0;
         }
 
         private static void AddMoney(CCSPlayerController player, int money)

jRandomSkills - SRC Files/src/player/skills/RobinHood.cs

@@ -14,22 +14,20 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var victim = @event.Userid;
-                var attacker = @event.Attacker;
-                var damage = @event.DmgHealth;
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
+        }
 
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-                if (attackerInfo?.Skill != skillName) return HookResult.Continue;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            var attacker = @event.Attacker;
+            var damage = @event.DmgHealth;
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
 
-                int moneyToSteal = damage * moneyMultiplier;
-                StealMoney(victim!, attacker!, moneyToSteal);
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (attackerInfo?.Skill != skillName) return;
 
-                return HookResult.Continue;
-            });
+            int moneyToSteal = damage * moneyMultiplier;
+            StealMoney(victim!, attacker!, moneyToSteal);
         }
 
         private static void StealMoney(CCSPlayerController victim, CCSPlayerController attacker, int money)

jRandomSkills - SRC Files/src/player/skills/Rubber.cs

@@ -17,36 +17,32 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
-
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return HookResult.Continue;
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
-
-                var victimPawn = victim!.PlayerPawn.Value;
-                if (victimPawn == null || !victimPawn.IsValid) return HookResult.Continue;
-
-                if (attackerInfo?.Skill == skillName)
-                    if (playersToSlow.ContainsKey(victimPawn))
-                        playersToSlow[victimPawn] = Server.TickCount + (64 * rubberTime);
-                    else playersToSlow.TryAdd(victimPawn, Server.TickCount + (64 * rubberTime));
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                playersToSlow.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
         }
 
-        private static void OnTick()
+        public static void NewRound()
+        {
+            playersToSlow.Clear();
+        }
+
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
+
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim) || attacker == victim) return;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+
+            var victimPawn = victim!.PlayerPawn.Value;
+            if (victimPawn == null || !victimPawn.IsValid) return;
+
+            if (attackerInfo?.Skill == skillName)
+                if (playersToSlow.ContainsKey(victimPawn))
+                    playersToSlow[victimPawn] = Server.TickCount + (64 * rubberTime);
+                else playersToSlow.TryAdd(victimPawn, Server.TickCount + (64 * rubberTime));
+
+        }
+
+        public static void OnTick()
         {
             foreach(var item in playersToSlow)
             {

jRandomSkills - SRC Files/src/player/skills/Saper.cs

@@ -13,54 +13,42 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventBombBeginplant>((@event, info) =>
+        }
+
+        public static void BombBegindefuse(EventBombBegindefuse @event)
+        {
+            var player = @event.Userid;
+            if (Instance.IsPlayerValid(player))
             {
-                var player = @event.Userid;
-
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
                 if (playerInfo?.Skill == skillName)
                 {
-                    var bombEntities = Utilities.FindAllEntitiesByDesignerName<CC4>("weapon_c4").ToList();
-
-                    if (bombEntities.Count != 0)
-                    {
-                        var bomb = bombEntities.FirstOrDefault();
-                        if (bomb != null)
-                        {
-                            bomb.BombPlacedAnimation = false;
-                            bomb.ArmedTime = 0.0f;
-                        }
-                    }
+                    var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+                    if (plantedBomb != null)
+                        Server.NextFrame(() => plantedBomb.DefuseCountDown = 0);
                 }
+            }
+        }
 
-                return HookResult.Continue;
-            });
+        public static void BombBeginplant(EventBombBeginplant @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-            Instance.RegisterEventHandler<EventBombBegindefuse>((@event, info) =>
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill == skillName)
             {
-                var player = @event.Userid;
-                
-                if (Instance.IsPlayerValid(player))
+                var bombEntities = Utilities.FindAllEntitiesByDesignerName<CC4>("weapon_c4").ToList();
+                if (bombEntities.Count != 0)
                 {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                    if (playerInfo?.Skill == skillName)
+                    var bomb = bombEntities.FirstOrDefault();
+                    if (bomb != null)
                     {
-                        var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                        if (plantedBomb != null)
-                        {
-                            Server.NextFrame(() =>
-                            {
-                                plantedBomb.DefuseCountDown = 0;
-                            });
-                        }
+                        bomb.BombPlacedAnimation = false;
+                        bomb.ArmedTime = 0.0f;
                     }
                 }
-
-                return HookResult.Continue;
-            });
+            }
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#8A2BE2", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/SecondLife.cs

@@ -15,50 +15,31 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (player == null || !player.IsValid || player.PlayerPawn?.Value == null) continue;
+        public static void NewRound()
+        {
+            secondLifePlayers.Clear();
+        }
 
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            int damage = @event.DmgHealth;
 
-                return HookResult.Continue;
-            });
+            if (!Instance.IsPlayerValid(victim)) return;
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            if (victimInfo == null || victimInfo.Skill != skillName) return;
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                secondLifePlayers.Clear();
-                return HookResult.Continue;
-            });
+            var victimPawn = victim!.PlayerPawn.Value;
+            if (victimPawn!.Health > 0 || secondLifePlayers.TryGetValue(victim.Handle, out _) == true)
+                return;
 
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var victim = @event.Userid;
-                int damage = @event.DmgHealth;
-
-                if (!Instance.IsPlayerValid(victim)) return HookResult.Continue;
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
-
-                var victimPawn = victim!.PlayerPawn.Value;
-                if (victimPawn!.Health > 0 || secondLifePlayers.TryGetValue(victim.Handle, out _) == true)
-                    return HookResult.Continue;
-
-                secondLifePlayers.Add(victim.Handle);
-                SetHealth(victim, secondLifeHealth);
-                var spawn = GetSpawnVector(victim);
-                if (spawn != null)
-                    victimPawn.Teleport(spawn, victimPawn.AbsRotation, null);
-                return HookResult.Stop;
-            });
+            secondLifePlayers.Add(victim.Handle);
+            SetHealth(victim, secondLifeHealth);
+            var spawn = GetSpawnVector(victim);
+            if (spawn != null)
+                victimPawn.Teleport(spawn, victimPawn.AbsRotation, null);
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Shade.cs

@@ -7,7 +7,6 @@ using CS2TraceRay.Struct;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
 using System.Numerics;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
 
@@ -22,35 +21,25 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var attacker = @event.Attacker;
-                var victim = @event.Userid;
+        }
 
-                if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return HookResult.Continue;
+        public static void NewRound()
+        {
+            noSpace.Clear();
+        }
 
-                var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var attacker = @event.Attacker;
+            var victim = @event.Userid;
 
-                if (attackerInfo?.Skill == skillName)
-                    TeleportAttackerBehindVictim(attacker!, victim!);
+            if (!Instance.IsPlayerValid(attacker) || !Instance.IsPlayerValid(victim)) return;
 
-                return HookResult.Continue;
-            });
+            var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                noSpace.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var item in noSpace)
-                    if (item.Value >= Server.TickCount)
-                        UpdateHUD(item.Key);
-            });
+            if (attackerInfo?.Skill == skillName)
+                TeleportAttackerBehindVictim(attacker!, victim!);
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -58,6 +47,13 @@ namespace jRandomSkills
             noSpace.Remove(player);
         }
 
+        public static void OnTick()
+        {
+            foreach (var item in noSpace)
+                if (item.Value >= Server.TickCount)
+                    UpdateHUD(item.Key);
+        }
+
         private static void UpdateHUD(CCSPlayerController player)
         {
             var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == skillName);

jRandomSkills - SRC Files/src/player/skills/ShortBomb.cs

@@ -14,21 +14,19 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventBombPlanted>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+        public static void BombPlanted(EventBombPlanted @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
-                if (plantedBomb != null)
-                    Server.NextFrame(() => plantedBomb.C4Blow = (float)Server.EngineTime + detonationTime);
-
-                return HookResult.Continue;
-            });
+            var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
+            if (plantedBomb != null)
+                Server.NextFrame(() => plantedBomb.C4Blow = (float)Server.EngineTime + detonationTime);
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#f5b74c", CsTeam onlyTeam = CsTeam.Terrorist, bool needsTeammates = false, int detonationTime = 20) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/Silent.cs

@@ -1,5 +1,5 @@
 using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using static jRandomSkills.jRandomSkills;
@@ -13,26 +13,24 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.HookUserMessage(208, um =>
-            {
-                var soundevent = um.ReadUInt("soundevent_hash");
-                var userIndex = um.ReadUInt("source_entity_index");
+        public static void PlayerMakeSound(UserMessage um)
+        {
+            var soundevent = um.ReadUInt("soundevent_hash");
+            var userIndex = um.ReadUInt("source_entity_index");
+            if (userIndex == 0) return;
 
-                if (userIndex == 0) return HookResult.Continue;
+            if (!Instance.footstepSoundEvents.Contains(soundevent) && !Instance.silentSoundEvents.Contains(soundevent))
+                return;
 
-                if (!Instance.footstepSoundEvents.Contains(soundevent) && !Instance.silentSoundEvents.Contains(soundevent))
-                    return HookResult.Continue;
+            var player = Utilities.GetPlayers().FirstOrDefault(p => p.Pawn?.Value != null && p.Pawn.Value.IsValid && p.Pawn.Value.Index == userIndex);
+            if (!Instance.IsPlayerValid(player)) return;
 
-                var player = Utilities.GetPlayers().FirstOrDefault(p => p.Pawn?.Value != null && p.Pawn.Value.IsValid && p.Pawn.Value.Index == userIndex);
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                um.Recipients.Clear();
-                return HookResult.Handled;
-            }, HookMode.Pre);
+            um.Recipients.Clear();
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#333333", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/SniperElite.cs

@@ -19,38 +19,21 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
+        public static void NewRound()
+        {
+            sniperElites.Clear();
+        }
 
-                return HookResult.Continue;
-            });
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill == skillName)
+                sniperElites.Remove(player.SteamID);
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                sniperElites.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    sniperElites.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Soldier.cs

@@ -1,6 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
@@ -16,24 +14,6 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
-            VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage, HookMode.Pre);
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -46,36 +26,34 @@ namespace jRandomSkills
             SkillUtils.PrintToChat(player, $"{ChatColors.DarkRed}{Localization.GetTranslation("soldier")}{ChatColors.Lime}: " + Localization.GetTranslation("soldier_desc2", newScale), false);
         }
 
-        private static HookResult OnTakeDamage(DynamicHook h)
+        public static void OnTakeDamage(DynamicHook h)
         {
             CEntityInstance param = h.GetParam<CEntityInstance>(0);
             CTakeDamageInfo param2 = h.GetParam<CTakeDamageInfo>(1);
 
             if (param == null || param.Entity == null || param2 == null || param2.Attacker == null || param2.Attacker.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerPawn attackerPawn = new(param2.Attacker.Value.Handle);
             CCSPlayerPawn victimPawn = new(param.Handle);
 
             if (attackerPawn.DesignerName != "player" || victimPawn.DesignerName != "player")
-                return HookResult.Continue;
+                return;
 
             if (attackerPawn == null || attackerPawn.Controller?.Value == null || victimPawn == null || victimPawn.Controller?.Value == null)
-                return HookResult.Continue;
+                return;
 
             CCSPlayerController attacker = attackerPawn.Controller.Value.As<CCSPlayerController>();
             CCSPlayerController victim = victimPawn.Controller.Value.As<CCSPlayerController>();
 
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker.SteamID);
-            if (playerInfo == null) return HookResult.Continue;
+            if (playerInfo == null) return;
 
             if (playerInfo.Skill == skillName && attacker.PawnIsAlive)
             {
                 float? skillChance = playerInfo.SkillChance;
                 param2.Damage *= skillChance ?? 1f;
             }
-
-            return HookResult.Continue;
         }
 
         public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#09ba00", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float chanceFrom = 1.15f, float chanceTo = 1.35f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

jRandomSkills - SRC Files/src/player/skills/SoundMaker.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,49 +16,11 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) return;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                            EnableSkill(player);
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            UpdateHUD(player, skillInfo);
-                }
-            });
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
         }
 
         public static void EnableSkill(CCSPlayerController player)
@@ -77,6 +38,26 @@ namespace jRandomSkills
             SkillPlayerInfo.Remove(player.SteamID);
         }
 
+        public static void PlayerDeath(EventPlayerDeath @event)
+        {
+            var player = @event.Userid;
+            if (player == null || !player.IsValid) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+            if (playerInfo?.Skill == skillName)
+                SkillPlayerInfo.Remove(player.SteamID);
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
+            {
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
+                if (playerInfo?.Skill == skillName)
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        UpdateHUD(player, skillInfo);
+            }
+        }
+
         private static void UpdateHUD(CCSPlayerController player, PlayerSkillInfo skillInfo)
         {
             float cooldown = 0;

jRandomSkills - SRC Files/src/player/skills/Spectator.cs

@@ -10,54 +10,38 @@ namespace jRandomSkills
     public class Spectator : ISkill
     {
         private const Skills skillName = Skills.Spectator;
-        private static bool blocked = false;
         private static readonly float distance = Config.GetValue<float>(skillName, "distance");
         private static readonly Dictionary<ulong, (uint, CDynamicProp, CCSPlayerPawn)> cameras = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                blocked = true;
-                foreach (var player in Utilities.GetPlayers())
-                    if (cameras.TryGetValue(player.SteamID, out _))
-                        DisableSkill(player);
+        public static void NewRound()
+        {
+            foreach (var camera in cameras)
+                camera.Value.Item2.Remove();
+            cameras.Clear();
+        }
 
-                foreach (var camera in cameras)
-                    camera.Value.Item2.Remove();
-                cameras.Clear();
-                return HookResult.Continue;
-            });
+        public static void WeaponPickup(EventItemPickup @event)
+        {
+            var player = @event.Userid;
+            if (!Instance.IsPlayerValid(player)) return;
+            var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
+            if (playerInfo?.Skill != skillName) return;
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                blocked = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventItemPickup>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (!Instance.IsPlayerValid(player)) return HookResult.Continue;
-                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player?.SteamID);
-                if (playerInfo?.Skill != skillName) return HookResult.Continue;
-
-                var pawn = player!.PlayerPawn.Value;
-                if (pawn == null || !pawn.IsValid || pawn.CameraServices == null) return HookResult.Continue;
-                if (cameras.TryGetValue(player.SteamID, out var cameraInfo) && cameraInfo.Item1 != pawn.CameraServices.ViewEntity.Raw)
-                    BlockWeapon(player, true);
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
+            var pawn = player!.PlayerPawn.Value;
+            if (pawn == null || !pawn.IsValid || pawn.CameraServices == null) return;
+            if (cameras.TryGetValue(player.SteamID, out var cameraInfo) && cameraInfo.Item1 != pawn.CameraServices.ViewEntity.Raw)
+                BlockWeapon(player, true);
         }
 
         public static void UseSkill(CCSPlayerController player)
         {
             var playerPawn = player.PlayerPawn.Value;
-            if (playerPawn?.CBodyComponent == null || blocked) return;
+            if (playerPawn?.CBodyComponent == null) return;
             ChangeCamera(player);
         }
 
@@ -66,7 +50,7 @@ namespace jRandomSkills
             ChangeCamera(player, true);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
                 if (cameras.TryGetValue(player.SteamID, out var cameraInfo) && cameraInfo.Item2.IsValid)

jRandomSkills - SRC Files/src/player/skills/SwapPosition.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using jRandomSkills.src.utils;
-using static CounterStrikeSharp.API.Core.Listeners;
 using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
@@ -17,55 +16,25 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void NewRound()
+        {
+            SkillPlayerInfo.Clear();
+        }
+
+        public static void OnTick()
+        {
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill == skillName)
-                        {
-                            EnableSkill(player);
-                        }
-                    }
-                });
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                SkillPlayerInfo.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
-            {
-                var player = @event.Userid;
-                if (player == null || !player.IsValid) return HookResult.Continue;
-
                 var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
                 if (playerInfo?.Skill == skillName)
-                    SkillPlayerInfo.Remove(player.SteamID);
-
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<OnTick>(() =>
-            {
-                foreach (var player in Utilities.GetPlayers())
-                {
-                    var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                    if (playerInfo?.Skill == skillName)
-                        if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
-                            if (skillInfo.LastClick.AddSeconds(4) >= DateTime.Now)
-                                UpdateHUD(player, skillInfo, true);
-                            else
-                                UpdateHUD(player, skillInfo, false);
-                }
-            });
+                    if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
+                        if (skillInfo.LastClick.AddSeconds(4) >= DateTime.Now)
+                            UpdateHUD(player, skillInfo, true);
+                        else
+                            UpdateHUD(player, skillInfo, false);
+            }
         }
 
         public static void EnableSkill(CCSPlayerController player)

jRandomSkills - SRC Files/src/player/skills/Teleporter.cs

@@ -13,23 +13,18 @@ namespace jRandomSkills
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
-            
-            Instance.RegisterEventHandler<EventPlayerHurt>((@event, info) =>
-            {
-                var victim = @event.Userid;
-                var attacker = @event.Attacker;
+        }
 
-                if (!Instance.IsPlayerValid(victim) || !Instance.IsPlayerValid(attacker)) return HookResult.Continue;
+        public static void PlayerHurt(EventPlayerHurt @event)
+        {
+            var victim = @event.Userid;
+            var attacker = @event.Attacker;
 
-                var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
+            if (!Instance.IsPlayerValid(victim) || !Instance.IsPlayerValid(attacker)) return;
+            var attackerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == attacker?.SteamID);
 
-                if (attackerInfo?.Skill == skillName)
-                {
-                    TeleportPlayers(attacker!, victim!);
-                }
-
-                return HookResult.Continue;
-            });
+            if (attackerInfo?.Skill == skillName)
+                TeleportPlayers(attacker!, victim!);
         }
 
         private static void TeleportPlayers(CCSPlayerController attacker, CCSPlayerController victim)

jRandomSkills - SRC Files/src/player/skills/Thief.cs

@@ -13,23 +13,39 @@ namespace jRandomSkills
 
         public static void LoadSkill()
         {
-            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
+            SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
+        public static void OnTick()
+        {
+            if (Server.TickCount % 32 != 0) return;
+            foreach (var player in Utilities.GetPlayers())
             {
-                Instance.AddTimer(0.1f, () =>
-                {
-                    foreach (var player in Utilities.GetPlayers())
-                    {
-                        if (!Instance.IsPlayerValid(player)) continue;
-                        var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
-                        if (playerInfo?.Skill != skillName) continue;
-                        EnableSkill(player);
-                    }
-                });
+                if (!SkillUtils.HasMenu(player)) continue;
+                var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
 
-                return HookResult.Continue;
-            });
+                if (playerInfo == null || playerInfo.Skill != skillName) continue;
+                var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
+                if (enemies.Length > 0)
+                {
+                    HashSet<(string, string)> menuItems = [];
+                    foreach (var enemy in enemies)
+                    {
+                        var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
+                        if (enemyInfo == null) continue;
+                        var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
+                        if (skillData == null) continue;
+                        menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
+                    }
+                    SkillUtils.CreateMenu(player, menuItems);
+                }
+            }
+        }
+
+        public static void NewRound()
+        {
+            foreach (var player in Utilities.GetPlayers())
+                SkillUtils.CloseMenu(player);
         }
 
         public static void TypeSkill(CCSPlayerController player, string[] commands)
@@ -57,24 +73,22 @@ namespace jRandomSkills
 
         public static void EnableSkill(CCSPlayerController player)
         {
-            SkillUtils.PrintToChat(player, Localization.GetTranslation("thief") + ":", false);
-
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("thief_select_info")}");
-            var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
+            var enemies = Utilities.GetPlayers().Where(p => p.PawnIsAlive && p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator && p.Team != CsTeam.None).ToArray();
             if (enemies.Length > 0)
             {
+                HashSet<(string, string)> menuItems = [];
                 foreach (var enemy in enemies)
                 {
                     var enemyInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == enemy.SteamID);
                     if (enemyInfo == null) continue;
                     var skillData = SkillData.Skills.FirstOrDefault(s => s.Skill == enemyInfo.Skill);
                     if (skillData == null) continue;
-                    player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}: {ChatColors.Red}{skillData.Name}");
+                    menuItems.Add(($"{enemy.PlayerName} : {skillData.Name}", enemy.Index.ToString()));
                 }
+                SkillUtils.CreateMenu(player, menuItems);
             }
             else
-                player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
-            player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
+                player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
         }
 
         public static void DisableSkill(CCSPlayerController player)
@@ -82,6 +96,7 @@ namespace jRandomSkills
             var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
             if (playerInfo == null) return;
             playerInfo.SpecialSkill = Skills.None;
+            SkillUtils.CloseMenu(player);
         }
 
         private static void DeacitvateSkill(CCSPlayerController player, CCSPlayerController enemy)
@@ -92,9 +107,12 @@ namespace jRandomSkills
 
             if (playerInfo != null)
             {
-                playerInfo.Skill = enemyInfo.Skill;
-                playerInfo.SpecialSkill = skillName;
-                Instance.SkillAction(enemyInfo.Skill.ToString(), "EnableSkill", [player]);
+                Instance.AddTimer(.1f, () =>
+                {
+                    playerInfo.Skill = enemyInfo.Skill;
+                    playerInfo.SpecialSkill = skillName;
+                    Instance.SkillAction(enemyInfo.Skill.ToString(), "EnableSkill", [player]);
+                });
                 player.PrintToChat($" {ChatColors.Green}" + Localization.GetTranslation("thief_player_info", enemy.PlayerName));
             }
 

jRandomSkills - SRC Files/src/player/skills/ThirdEye.cs

@@ -3,47 +3,31 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using jRandomSkills.src.player;
 using System.Drawing;
-using static jRandomSkills.jRandomSkills;
 
 namespace jRandomSkills
 {
     public class ThirdEye : ISkill
     {
         private const Skills skillName = Skills.ThirdEye;
-        private static bool blocked = false;
         private static readonly float distance = Config.GetValue<float>(skillName, "distance");
         private static readonly Dictionary<ulong, (uint, CDynamicProp)> cameras = [];
 
         public static void LoadSkill()
         {
             SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
+        }
 
-            Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
-            {
-                blocked = true;
-                foreach (var player in Utilities.GetPlayers())
-                    if (cameras.TryGetValue(player.SteamID, out _))
-                        DisableSkill(player);
-
-                foreach (var camera in cameras)
-                    camera.Value.Item2.Remove();
-                cameras.Clear();
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
-            {
-                blocked = false;
-                return HookResult.Continue;
-            });
-
-            Instance.RegisterListener<Listeners.OnTick>(OnTick);
+        public static void NewRound()
+        {
+            foreach (var camera in cameras)
+                camera.Value.Item2.Remove();
+            cameras.Clear();
         }
 
         public static void UseSkill(CCSPlayerController player)
         {
             var playerPawn = player.PlayerPawn.Value;
-            if (playerPawn?.CBodyComponent == null || blocked) return;
+            if (playerPawn?.CBodyComponent == null) return;
             ChangeCamera(player);
         }
 
@@ -52,7 +36,7 @@ namespace jRandomSkills
             ChangeCamera(player, true);
         }
 
-        private static void OnTick()
+        public static void OnTick()
         {
             foreach (var player in Utilities.GetPlayers())
                 if (cameras.TryGetValue(player.SteamID, out var cameraInfo) && cameraInfo.Item2.IsValid)