Fix issues with EntityEffectEvents triggering for all events