Don't call SayCommand forwards for chat triggers (bug 5863, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Sat Aug 24 21:59:52 2013 -0400 (2013-08-24)
changeset 4052c5b6ed34f5e3
parent 4051 7cc075f61505
child 4053 c3578d3e7351
Don't call SayCommand forwards for chat triggers (bug 5863, r=asherkin).
core/ChatTriggers.cpp
     1.1 --- a/core/ChatTriggers.cpp	Sat Aug 24 21:59:52 2013 -0400
     1.2 +++ b/core/ChatTriggers.cpp	Sat Aug 24 21:59:52 2013 -0400
     1.3 @@ -349,7 +349,7 @@
     1.4  	{
     1.5  		m_bPluginIgnored = false;
     1.6  	}
     1.7 -	else if (!m_bWasFloodedMessage && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
     1.8 +	else if (!m_bWasFloodedMessage && !m_bIsChatTrigger && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
     1.9  	{	
    1.10  		m_pOnClientSayCmd_Post->PushCell(client);
    1.11  		m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
    1.12 @@ -438,7 +438,7 @@
    1.13  cell_t ChatTriggers::CallOnClientSayCommand(int client)
    1.14  {
    1.15  	cell_t res = Pl_Continue;
    1.16 -	if (m_pOnClientSayCmd->GetFunctionCount() != 0)
    1.17 +	if (!m_bIsChatTrigger && m_pOnClientSayCmd->GetFunctionCount() != 0)
    1.18  	{
    1.19  		m_pOnClientSayCmd->PushCell(client);
    1.20  		m_pOnClientSayCmd->PushString(m_Arg0Backup);