From ba55ef0b2e47235781551dd1cc30232707661db4 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sat, 24 Aug 2013 21:59:52 -0400 Subject: [PATCH] Don't call SayCommand forwards for chat triggers (bug 5863, r=asherkin). --- core/ChatTriggers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index 2ab5dd83..307ff339 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -349,7 +349,7 @@ void ChatTriggers::OnSayCommand_Post() { 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->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 res = Pl_Continue; - if (m_pOnClientSayCmd->GetFunctionCount() != 0) + if (!m_bIsChatTrigger && m_pOnClientSayCmd->GetFunctionCount() != 0) { m_pOnClientSayCmd->PushCell(client); m_pOnClientSayCmd->PushString(m_Arg0Backup);