Removed the args variable from on_player_ability_on/*_off

Removed OnPlayerAbilityOn/*Off listeners
ThaPwned · Feb 3, 2019 · f45c458 · f45c458
1 parent e212926
commit f45c458
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/addons/source-python/plugins/wcs/core/listeners/__init__.py b/addons/source-python/plugins/wcs/core/listeners/__init__.py
@@ -27,8 +27,6 @@
     'OnIsRaceUsableText',
     'OnIsSkillExecutable',
     'OnIsSkillExecutableText',
-    'OnPlayerAbilityOff',
-    'OnPlayerAbilityOn',
     'OnPlayerChangeRace',
     'OnPlayerDelete',
     'OnPlayerDestroy',
@@ -102,14 +100,6 @@ class OnIsSkillExecutableText(ListenerManagerDecorator):
     manager = ListenerManager()
 
 
-class OnPlayerAbilityOff(ListenerManagerDecorator):
-    manager = ListenerManager()
-
-
-class OnPlayerAbilityOn(ListenerManagerDecorator):
-    manager = ListenerManager()
-
-
 class OnPlayerChangeRace(ListenerManagerDecorator):
     manager = ListenerManager()
 

diff --git a/addons/source-python/plugins/wcs/info.ini b/addons/source-python/plugins/wcs/info.ini
@@ -2,5 +2,5 @@ verbose_name = "Warcraft Source"
 code_name = "Reignited"
 author = "Tha Pwned"
 description = "Warcraft Source using Source.Python to be faster, expandable, and flexible"
-version = "2019.02.02-1"
+version = "2019.02.03-1"
 url = "https://forums.sourcepython.com/viewtopic.php?f=7&t=1925"
diff --git a/addons/source-python/plugins/wcs/wcs.py b/addons/source-python/plugins/wcs/wcs.py
@@ -100,8 +100,6 @@
 #   Listeners
 from .core.listeners import OnDownloadComplete
 from .core.listeners import OnIsSkillExecutableText
-from .core.listeners import OnPlayerAbilityOff
-from .core.listeners import OnPlayerAbilityOn
 from .core.listeners import OnPlayerChangeRace
 from .core.listeners import OnPlayerDelete
 from .core.listeners import OnPlayerDestroy
@@ -1152,9 +1150,7 @@ def client_ability_plus_command(command, ability:int=1, *args:str):
                     reason = skill.is_executable()
 
                     if reason is SkillReason.ALLOWED:
-                        OnPlayerAbilityOn.manager.notify(wcsplayer, skill, args)
-
-                        with FakeEvent('player_ability_on' if skill._type is ModuleType.SP else f'{skill_name}_on', userid=wcsplayer.userid, args=args) as event:
+                        with FakeEvent('player_ability_on' if skill._type is ModuleType.SP else f'{skill_name}_on', userid=wcsplayer.userid) as event:
                             skill.execute(event.name, event)
                     elif reason is SkillReason.TEAM:
                         ability_team_message.send(command.index)
@@ -1197,9 +1193,7 @@ def client_ability_minus_command(command, ability:int=1, *args:str):
 
             if 'player_ability_off' in skill.config['event']:
                 if ability == i:
-                    OnPlayerAbilityOff.manager.notify(wcsplayer, skill, args)
-
-                    with FakeEvent('player_ability_off' if skill._type is ModuleType.SP else f'{skill_name}_off', userid=wcsplayer.userid, args=args) as event:
+                    with FakeEvent('player_ability_off' if skill._type is ModuleType.SP else f'{skill_name}_off', userid=wcsplayer.userid) as event:
                         skill.execute(event.name, event)
 
                     break