improvement: properly register and remove hooks and listeners when re…

…quired to save server resources when unused
Kandru · Jan 7, 2025 · 320e006 · 320e006
1 parent 0f6b2fb
commit 320e006
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/src/RollTheDice+DiceBigTaserBattery.cs b/src/RollTheDice+DiceBigTaserBattery.cs
@@ -8,6 +8,11 @@ public partial class RollTheDice : BasePlugin
 
         private Dictionary<string, string> DiceBigTaserBattery(CCSPlayerController player, CCSPlayerPawn playerPawn)
         {
+            // create listener if not exists
+            if (_playersWithBigTaserBattery.Count() == 0)
+            {
+                RegisterEventHandler<EventWeaponFire>(EventDiceBigTaserBatteryOnWeaponFire);
+            }
             int battery = _random.Next(2, 10);
             _playersWithBigTaserBattery.Add(player, battery);
             player.GiveNamedItem("weapon_taser");
@@ -20,18 +25,14 @@ private Dictionary<string, string> DiceBigTaserBattery(CCSPlayerController playe
             };
         }
 
-        private void DiceBigTaserBatteryLoad()
-        {
-            RegisterEventHandler<EventWeaponFire>(EventDiceBigTaserBatteryOnWeaponFire);
-        }
-
         private void DiceBigTaserBatteryUnload()
         {
             DiceBigTaserBatteryReset();
         }
 
         private void DiceBigTaserBatteryReset()
         {
+            DeregisterEventHandler<EventWeaponFire>(EventDiceBigTaserBatteryOnWeaponFire);
             _playersWithBigTaserBattery.Clear();
         }
 

diff --git a/src/RollTheDice+DiceFastBombAction.cs b/src/RollTheDice+DiceFastBombAction.cs
@@ -11,6 +11,12 @@ public partial class RollTheDice : BasePlugin
 
         private Dictionary<string, string> DiceFastBombAction(CCSPlayerController player, CCSPlayerPawn playerPawn)
         {
+            // create listener if not exists
+            if (_playersCanInstantDefuse.Count() == 0 && _playersCanInstantPlant.Count() == 0)
+            {
+                RegisterEventHandler<EventBombBegindefuse>(DiceFastBombActionEventBeginDefuse);
+                RegisterEventHandler<EventBombBeginplant>(DiceFastBombActionEventBeginPlant);
+            }
             if (playerPawn.TeamNum == (int)CsTeam.Terrorist)
             {
                 _playersCanInstantPlant.Add(player);
@@ -41,19 +47,15 @@ private Dictionary<string, string> DiceFastBombAction(CCSPlayerController player
             }
         }
 
-        private void DiceFastBombActionLoad()
-        {
-            RegisterEventHandler<EventBombBegindefuse>(DiceFastBombActionEventBeginDefuse);
-            RegisterEventHandler<EventBombBeginplant>(DiceFastBombActionEventBeginPlant);
-        }
-
         private void DiceFastBombActionUnload()
         {
             DiceFastBombActionReset();
         }
 
         private void DiceFastBombActionReset()
         {
+            DeregisterEventHandler<EventBombBegindefuse>(DiceFastBombActionEventBeginDefuse);
+            DeregisterEventHandler<EventBombBeginplant>(DiceFastBombActionEventBeginPlant);
             _playersCanInstantDefuse.Clear();
             _playersCanInstantPlant.Clear();
         }

diff --git a/src/RollTheDice+DiceIncreaseSpeed.cs b/src/RollTheDice+DiceIncreaseSpeed.cs
@@ -10,6 +10,11 @@ public partial class RollTheDice : BasePlugin
 
         private Dictionary<string, string> DiceIncreaseSpeed(CCSPlayerController player, CCSPlayerPawn playerPawn)
         {
+            // create listener if not exists
+            if (_playersWithIncreasedSpeed.Count() == 0)
+            {
+                RegisterEventHandler<EventPlayerHurt>(EventDiceIncreaseSpeedOnPlayerHurt);
+            }
             _playersWithIncreasedSpeed.Add(player);
             var speedIncrease = _random.NextDouble() * (2.0 - 1.5) + 1.5;
             playerPawn.VelocityModifier *= (float)speedIncrease;
@@ -25,18 +30,14 @@ private Dictionary<string, string> DiceIncreaseSpeed(CCSPlayerController player,
             };
         }
 
-        private void DiceIncreaseSpeedLoad()
-        {
-            RegisterEventHandler<EventPlayerHurt>(EventDiceIncreaseSpeedOnPlayerHurt);
-        }
-
         private void DiceIncreaseSpeedUnload()
         {
             DiceIncreaseSpeedReset();
         }
 
         private void DiceIncreaseSpeedReset()
         {
+            DeregisterEventHandler<EventPlayerHurt>(EventDiceIncreaseSpeedOnPlayerHurt);
             // iterate through all players
             foreach (var player in _playersWithIncreasedSpeed)
             {