Fixed #299.

Author: jordanbriere

addons/source-python/docs/source-python/source/developing/module_tutorials/listeners.rst

@@ -420,6 +420,20 @@ Called when a player runs a command.
         pass
 
 
+OnPlayerPostRunCommand
+----------------------
+
+Called after a player ran a command.
+
+.. code-block:: python
+
+    from listeners import OnPlayerPostRunCommand
+
+    @OnPlayerPostRunCommand
+    def on_player_post_run_command(player, user_cmd):
+        pass
+
+
 OnPluginLoaded
 --------------
 

addons/source-python/packages/source-python/listeners/__init__.py

@@ -73,6 +73,7 @@
 from _listeners import on_tick_listener_manager
 from _listeners import on_server_output_listener_manager
 from _listeners import on_player_run_command_listener_manager
+from _listeners import on_player_post_run_command_listener_manager
 from _listeners import on_button_state_changed_listener_manager
 
 
@@ -110,6 +111,7 @@
            'OnNetworkidValidated',
            'OnButtonStateChanged',
            'OnPlayerRunCommand',
+           'OnPlayerPostRunCommand',
            'OnPluginLoaded',
            'OnPluginLoading',
            'OnPluginUnloaded',
@@ -494,6 +496,10 @@ class OnPlayerRunCommand(ListenerManagerDecorator):
 
     manager = on_player_run_command_listener_manager
 
+class OnPlayerPostRunCommand(ListenerManagerDecorator):
+    """Register/unregister a post run command listener."""
+
+    manager = on_player_post_run_command_listener_manager
 
 class OnButtonStateChanged(ListenerManagerDecorator):
     """Register/unregister a button state change listener."""

src/core/modules/listeners/listeners_wrap.cpp

@@ -62,6 +62,7 @@ DEFINE_MANAGER_ACCESSOR(OnDataLoaded)
 DEFINE_MANAGER_ACCESSOR(OnCombinerPreCache)
 DEFINE_MANAGER_ACCESSOR(OnDataUnloaded)
 DEFINE_MANAGER_ACCESSOR(OnPlayerRunCommand)
+DEFINE_MANAGER_ACCESSOR(OnPlayerPostRunCommand)
 DEFINE_MANAGER_ACCESSOR(OnButtonStateChanged)
 
 static CConVarChangedListenerManager s_OnConVarChanged;
@@ -185,5 +186,6 @@ void export_listener_managers(scope _listeners)
 	_listeners.attr("on_server_output_listener_manager") = object(ptr((CListenerManager *)GetOnServerOutputListenerManager()));
 
 	_listeners.attr("on_player_run_command_listener_manager") = object(ptr(GetOnPlayerRunCommandListenerManager()));
+	_listeners.attr("on_player_post_run_command_listener_manager") = object(ptr(GetOnPlayerPostRunCommandListenerManager()));
 	_listeners.attr("on_button_state_changed_listener_manager") = object(ptr(GetOnButtonStateChangedListenerManager()));
 }

src/core/sp_hooks.cpp

@@ -159,11 +159,24 @@ void InitHooks(CBaseEntity* pEntity)
 //---------------------------------------------------------------------------------
 bool PrePlayerRunCommand(HookType_t hook_type, CHook* pHook)
 {
-	GET_LISTENER_MANAGER(OnPlayerRunCommand, run_command_manager);
-	GET_LISTENER_MANAGER(OnButtonStateChanged, button_state_manager);
+	bool bUsePreRegister;
 
-	if (!run_command_manager->GetCount() && !button_state_manager->GetCount())
-		return false;
+	if (hook_type == HOOKTYPE_PRE) {
+		GET_LISTENER_MANAGER(OnPlayerRunCommand, run_command_manager);
+		GET_LISTENER_MANAGER(OnButtonStateChanged, button_state_manager);
+
+		if (!run_command_manager->GetCount() && !button_state_manager->GetCount())
+			return false;
+	}
+	else {
+		bUsePreRegister = pHook->m_bUsePreRegisters;
+		pHook->m_bUsePreRegisters = true;
+
+		GET_LISTENER_MANAGER(OnPlayerPostRunCommand, post_run_command_manager);
+
+		if (!post_run_command_manager->GetCount())
+			return false;
+	}
 
 	static object Player = import("players.entity").attr("Player");
 
@@ -181,24 +194,35 @@ bool PrePlayerRunCommand(HookType_t hook_type, CHook* pHook)
 #endif
 
 	object player = Player(index);
-	CALL_LISTENERS(OnPlayerRunCommand, player, ptr(pCmd));
 
-	if (button_state_manager->GetCount())
-	{
-		CBaseEntityWrapper* pWrapper = (CBaseEntityWrapper*) pEntity;
-		static int offset = pWrapper->FindDatamapPropertyOffset("m_nButtons");
+	if (hook_type == HOOKTYPE_PRE) {
+		CALL_LISTENERS(OnPlayerRunCommand, player, ptr(pCmd));
 
-		int buttons = pWrapper->GetDatamapPropertyByOffset<int>(offset);
-		if (buttons != pCmd->buttons)
+		GET_LISTENER_MANAGER(OnButtonStateChanged, button_state_manager);
+		if (button_state_manager->GetCount())
 		{
-			CALL_LISTENERS(OnButtonStateChanged, player, buttons, pCmd->buttons);
+			CBaseEntityWrapper* pWrapper = (CBaseEntityWrapper*) pEntity;
+			static int offset = pWrapper->FindDatamapPropertyOffset("m_nButtons");
+
+			int buttons = pWrapper->GetDatamapPropertyByOffset<int>(offset);
+			if (buttons != pCmd->buttons)
+			{
+				CALL_LISTENERS(OnButtonStateChanged, player, buttons, pCmd->buttons);
+			}
 		}
 	}
-	
+	else {
+		CALL_LISTENERS(OnPlayerPostRunCommand, player, ptr(pCmd));
+	}
+
 #if defined(ENGINE_BRANCH_TF2)
 	CUserCmd* pRealCmd = pHook->GetArgument<CUserCmd*>(1);
 	memcpy(pRealCmd, pCmd, sizeof(CUserCmd));
 #endif
 
+	if (hook_type == HOOKTYPE_POST) {
+		pHook->m_bUsePreRegisters = bUsePreRegister;
+	}
+
 	return false;
 }

src/core/sp_main.cpp

@@ -268,6 +268,11 @@ bool CSourcePython::Load(	CreateInterfaceFn interfaceFactory, CreateInterfaceFn
 		(HookHandlerFn*) (void*) &PrePlayerRunCommand,
 		HOOKTYPE_PRE));
 
+	g_EntityHooks.push_back(new PlayerHook(
+		"run_command",
+		(HookHandlerFn*) (void*) &PrePlayerRunCommand,
+		HOOKTYPE_POST));
+
 	InitHooks();
 
 	Msg(MSG_PREFIX "Loaded successfully.\n");