Split PlayerBasedFeatureCommand in 2 classes

Author: KirillMysnik

srcds/addons/source-python/plugins/admin/core/frontends/commands.py

@@ -121,15 +121,10 @@ def client_callback(command_info):
         return client_callback
 
 
-class PlayerBasedFeatureCommand(BaseFeatureCommand):
-    def __init__(self, commands, feature, deny_mass_execution=False):
-        super().__init__(commands, feature)
-
-        self._deny_mass_execution = deny_mass_execution
-
-    def _execute(self, command_info, filter_str, filter_args):
-        client = clients[command_info.index]
+class BasePlayerBasedFeatureCommand(BaseFeatureCommand):
+    deny_mass_execution = False
 
+    def _get_target_players(self, client, filter_str, filter_args):
         players = []
         for player in iter_filter_targets(
                 filter_str, filter_args, client.player):
@@ -139,10 +134,18 @@ def _execute(self, command_info, filter_str, filter_args):
 
             players.append(player)
 
-        if self._deny_mass_execution and len(players) > 1:
-            return
+        if self.deny_mass_execution and len(players) > 1:
+            return []
+
+        return players
+
+
+class PlayerBasedFeatureCommand(BasePlayerBasedFeatureCommand):
+    def _execute(self, command_info, filter_str, filter_args):
+        client = clients[command_info.index]
+        for player in self._get_target_players(
+                client, filter_str, filter_args):
 
-        for player in players:
             client.sync_execution(self.feature.execute, (client, player))
 
     def _get_public_chat_callback(self):