UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't call SayCommand forwards for chat triggers (bug 5863, r=asherkin).

Browse Source
This commit is contained in:
Nicholas Hastings 2013-08-24 21:59:52 -04:00
parent 0c00f7393c
commit ba55ef0b2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/ChatTriggers.cpp
View File

@ -349,7 +349,7 @@ void ChatTriggers::OnSayCommand_Post()
{ {
m_bPluginIgnored = false; m_bPluginIgnored = false;
} }
else if (!m_bWasFloodedMessage && m_pOnClientSayCmd_Post->GetFunctionCount() != 0) else if (!m_bWasFloodedMessage && !m_bIsChatTrigger && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
{ {
m_pOnClientSayCmd_Post->PushCell(client); m_pOnClientSayCmd_Post->PushCell(client);
m_pOnClientSayCmd_Post->PushString(m_Arg0Backup); m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
@ -438,7 +438,7 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_
cell_t ChatTriggers::CallOnClientSayCommand(int client) cell_t ChatTriggers::CallOnClientSayCommand(int client)
{ {
cell_t res = Pl_Continue; cell_t res = Pl_Continue;
if (m_pOnClientSayCmd->GetFunctionCount() != 0) if (!m_bIsChatTrigger && m_pOnClientSayCmd->GetFunctionCount() != 0)
{ {
m_pOnClientSayCmd->PushCell(client); m_pOnClientSayCmd->PushCell(client);
m_pOnClientSayCmd->PushString(m_Arg0Backup); m_pOnClientSayCmd->PushString(m_Arg0Backup);