diff --git a/mp/src/game/server/cbase.cpp b/mp/src/game/server/cbase.cpp
index 4d653987..bf23baca 100644
--- a/mp/src/game/server/cbase.cpp
+++ b/mp/src/game/server/cbase.cpp
@@ -285,11 +285,8 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa
 			//
 			// Post the event with the default parameter.
 			//
-			if ( ( pCaller->Classify() == CLASS_TRIGGER || pCaller->Classify() == CLASS_TRIGGERSCRIPT || pCaller->Classify() == CLASS_TRIGGER_CLIP )
-				&& pCaller->GetName() == STRING( ev->m_iTarget ) )
-			{
+			if ( pCaller->Classify() == CLASS_TRIGGER && pCaller->GetName() == STRING( ev->m_iTarget ) )
 				g_EventQueue.AddEvent( pCaller, STRING(ev->m_iTargetInput), Value, ev->m_flDelay + fDelay, pActivator, pCaller, ev->m_iIDStamp );
-			}
 			else
 				g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), Value, ev->m_flDelay + fDelay, pActivator, pCaller, ev->m_iIDStamp );
 		}
@@ -301,11 +298,8 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa
 			variant_t ValueOverride;
 			ValueOverride.SetString( ev->m_iParameter );
 
-			if ( ( pCaller->Classify() == CLASS_TRIGGER || pCaller->Classify() == CLASS_TRIGGERSCRIPT || pCaller->Classify() == CLASS_TRIGGER_CLIP )
-				&& pCaller->GetName() == STRING( ev->m_iTarget ) )
-			{
+			if ( pCaller->Classify() == CLASS_TRIGGER && pCaller->GetName() == STRING( ev->m_iTarget ) )
 				g_EventQueue.AddEvent( pCaller, STRING(ev->m_iTargetInput), ValueOverride, ev->m_flDelay, pActivator, pCaller, ev->m_iIDStamp );
-			}
 			else
 				g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), ValueOverride, ev->m_flDelay, pActivator, pCaller, ev->m_iIDStamp );
 		}