From d77ff384281c47cbf63cfd9847973bda05bb8f3d Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sat, 24 Aug 2013 21:59:52 -0400 Subject: [PATCH] Fixed regression causing public triggers to no longer display (bug 5863, r=drifter). --- core/ChatTriggers.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index 5dd28db0..5690c764 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -311,8 +311,7 @@ void ChatTriggers::OnSayCommand_Pre() RETURN_META(MRES_SUPERCEDE); } - if (m_bWillProcessInPost || \ - (is_silent && g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)) + if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID))) { RETURN_META(MRES_SUPERCEDE); }